Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mega rename

Browse Source
This commit is contained in:
Mateusz Naściszewski 2024-09-15 20:29:02 +02:00
parent f8c0ad6faf
commit ae3c563713
No known key found for this signature in database
GPG Key ID: 6A6067123E4CAF6E
216 changed files with 2955 additions and 2955 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
asm/code_2.s
View File

@ -133,7 +133,7 @@ QuickSave:
movs r4, 0
movs r6, 0
movs r0, 0
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
bl sub_8014144
bl InitFontPalette
movs r0, 0x2
@ -144,7 +144,7 @@ QuickSave:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
movs r1, 0x14
bl sub_8009408
@ -160,7 +160,7 @@ QuickSave:
bl sub_8099744
bl sub_8099750
movs r0, 0x3
bl sub_80063D8
bl SetCharacterMask
movs r0, 0
movs r1, 0
bl sub_8005838
@ -169,7 +169,7 @@ QuickSave:
movs r1, 0
movs r2, 0
movs r3, 0x20
bl sub_80141B4
bl xxx_info_box_80141B4
b _08000892
.align 2, 0
_080007AC: .4byte gUnknown_2026E4E
@ -234,7 +234,7 @@ _08000822:
movs r1, 0
movs r2, 0
ldr r3, _08000838
bl sub_80141B4
bl xxx_info_box_80141B4
movs r6, 0x3C
movs r4, 0x1
b _08000892
@ -248,7 +248,7 @@ _0800083C:
movs r1, 0
movs r2, 0
movs r3, 0
bl sub_80141B4
bl xxx_info_box_80141B4
movs r4, 0x3
b _08000892
.align 2, 0
@ -258,7 +258,7 @@ _08000854:
movs r1, 0
movs r2, 0
ldr r3, _08000868
bl sub_80141B4
bl xxx_info_box_80141B4
_08000860:
movs r4, 0x2
b _08000892
@ -297,7 +297,7 @@ _08000892:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
bl xxx_update_stuff
add sp, 0xC
@ -314,7 +314,7 @@ sub_80008C0:
movs r4, 0
movs r6, 0
movs r0, 0
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
bl sub_8014144
bl InitFontPalette
movs r0, 0x2
@ -325,7 +325,7 @@ sub_80008C0:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
movs r1, 0x14
bl sub_8009408
@ -341,7 +341,7 @@ sub_80008C0:
bl sub_8099744
bl sub_8099750
movs r0, 0x3
bl sub_80063D8
bl SetCharacterMask
cmp r5, 0x1
beq _08000948
cmp r5, 0x1
@ -358,7 +358,7 @@ _08000934:
movs r1, 0
movs r2, 0
movs r3, 0x20
bl sub_80141B4
bl xxx_info_box_80141B4
movs r4, 0x2
b _080009A2
.align 2, 0
@ -374,7 +374,7 @@ _08000952:
ldr r3, _08000964
movs r1, 0
movs r2, 0
bl sub_80141B4
bl xxx_info_box_80141B4
_0800095C:
movs r4, 0x1
b _080009A2
@ -425,7 +425,7 @@ _080009A2:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
bl xxx_update_stuff
add sp, 0x4
@ -446,7 +446,7 @@ sub_80009D0:
adds r4, r0, 0
movs r0, 0
movs r1, 0x18
bl sub_8001658
bl GetScriptVarValue
adds r7, r0, 0
movs r0, 0
mov r10, r0
@ -468,7 +468,7 @@ _08000A08:
movs r0, 0
movs r1, 0x18
movs r2, 0xB
bl sub_80018D8
bl SetScriptVarValue
bl sub_8096BD0
movs r0, 0x3
bl QuickSave
@ -490,13 +490,13 @@ _08000A30:
_08000A3A:
movs r0, 0
movs r1, 0x41
bl sub_80015C0
bl ClearScriptVarArray
_08000A42:
cmp r7, 0x4
bne _08000AB6
movs r0, 0
movs r1, 0xD
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_8002658
@ -536,18 +536,18 @@ _08000AA0:
_08000AA2:
movs r0, 0
movs r1, 0xD
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0xE
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
b _08000B70
_08000AB6:
cmp r7, 0x5
bne _08000B9C
movs r0, 0
movs r1, 0x12
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
mov r8, r0
@ -638,7 +638,7 @@ _08000B78:
movs r0, 0
movs r1, 0x13
mov r2, r8
bl sub_80018D8
bl SetScriptVarValue
ldr r1, _08000B98
movs r0, 0x2
str r0, [r1]
@ -978,7 +978,7 @@ _08000E1E:
add r0, sp, 0x174
bl sub_80011E8
adds r0, r5, 0
bl sub_8000EDC
bl SaveLoadRelated_8000EDC
add r4, sp, 0x1EC
movs r0, 0
ldrsh r1, [r4, r0]
@ -994,7 +994,7 @@ _08000E46:
_08000E50:
movs r0, 0
movs r1, 0x41
bl sub_80015C0
bl ClearScriptVarArray
ldrh r0, [r4]
adds r0, 0x1
lsls r0, 16
@ -1032,7 +1032,7 @@ _08000EA6:
movs r0, 0
movs r1, 0x41
movs r2, 0
bl sub_800199C
bl SetScriptVarArrayValue
b _08000A42
_08000EB2:
movs r7, 0xA
@ -1059,8 +1059,8 @@ _08000EC6:
bx r1
thumb_func_end sub_80009D0
thumb_func_start sub_8000EDC
sub_8000EDC:
thumb_func_start SaveLoadRelated_8000EDC
SaveLoadRelated_8000EDC:
push {r4-r7,lr}
sub sp, 0x8
adds r4, r0, 0
@ -1207,7 +1207,7 @@ _0800101C:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8000EDC
thumb_func_end SaveLoadRelated_8000EDC
thumb_func_start sub_8001024
sub_8001024:
@ -1225,7 +1225,7 @@ sub_8001024:
pop {r0}
bx r0
.align 2, 0
_08001040: .4byte gUnknown_203B040
_08001040: .4byte gPersonalityRelated_203B040
thumb_func_end sub_8001024
thumb_func_start sub_8001044
@ -1244,7 +1244,7 @@ sub_8001044:
pop {r0}
bx r0
.align 2, 0
_08001060: .4byte gUnknown_203B040
_08001060: .4byte gPersonalityRelated_203B040
thumb_func_end sub_8001044
thumb_func_start sub_8001064
@ -1273,7 +1273,7 @@ sub_8001064:
bl sub_808CE74
b _080010AE
.align 2, 0
_0800109C: .4byte gUnknown_203B040
_0800109C: .4byte gPersonalityRelated_203B040
_080010A0:
movs r4, 0x4
ldrsh r0, [r5, r4]
@ -1304,7 +1304,7 @@ _080010AE:
bl sub_808CE74
b _080010F2
.align 2, 0
_080010E0: .4byte gUnknown_203B040
_080010E0: .4byte gPersonalityRelated_203B040
_080010E4:
movs r4, 0x6
ldrsh r0, [r5, r4]
@ -1339,7 +1339,7 @@ _0800111C:
ldr r2, [r2]
movs r0, 0
movs r1, 0x27
bl sub_80018D8
bl SetScriptVarValue
_08001126:
ldr r3, _08001164
movs r0, 0x6
@ -1367,16 +1367,16 @@ _08001150:
ldr r2, [r2]
movs r0, 0
movs r1, 0x26
bl sub_80018D8
bl SetScriptVarValue
_0800115A:
add sp, 0x28
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08001164: .4byte gUnknown_203B040
_08001168: .4byte gUnknown_80B690C
_0800116C: .4byte gUnknown_80B6994
_08001164: .4byte gPersonalityRelated_203B040
_08001168: .4byte gBaseKindTable
_0800116C: .4byte gTalkKindTable
thumb_func_end sub_8001064
thumb_func_start sub_8001170

48
asm/code_8002774.s
View File

@ -602,8 +602,8 @@ _08002BAE:
bx r1
thumb_func_end sub_8002B5C
thumb_func_start sub_8002BB8
sub_8002BB8:
thumb_func_start SetVecFromDirectionSpeed
SetVecFromDirectionSpeed:
push {r4,r5,lr}
lsls r1, 24
asrs r1, 21
@ -621,11 +621,11 @@ sub_8002BB8:
pop {r2}
bx r2
.align 2, 0
_08002BD8: .4byte gUnknown_80B7E3C
thumb_func_end sub_8002BB8
_08002BD8: .4byte gVectorDirections
thumb_func_end SetVecFromDirectionSpeed
thumb_func_start sub_8002BDC
sub_8002BDC:
thumb_func_start VecDirection8Sign
VecDirection8Sign:
push {lr}
ldr r1, [r0]
cmp r1, 0
@ -676,10 +676,10 @@ _08002C28:
_08002C2A:
pop {r1}
bx r1
thumb_func_end sub_8002BDC
thumb_func_end VecDirection8Sign
thumb_func_start sub_8002C30
sub_8002C30:
thumb_func_start VecDirection4SignYX
VecDirection4SignYX:
push {lr}
ldr r1, [r0, 0x4]
cmp r1, 0
@ -708,10 +708,10 @@ _08002C58:
_08002C5A:
pop {r1}
bx r1
thumb_func_end sub_8002C30
thumb_func_end VecDirection4SignYX
thumb_func_start sub_8002C60
sub_8002C60:
thumb_func_start VecDirection8Radial
VecDirection8Radial:
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4]
@ -797,10 +797,10 @@ _08002CE8:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8002C60
thumb_func_end VecDirection8Radial
thumb_func_start sub_8002CF0
sub_8002CF0:
thumb_func_start VecDirection4Radial
VecDirection4Radial:
push {r4,lr}
adds r4, r0, 0
ldr r3, [r4]
@ -862,10 +862,10 @@ _08002D4C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8002CF0
thumb_func_end VecDirection4Radial
thumb_func_start sub_8002D54
sub_8002D54:
thumb_func_start SizedDeltaDirection4
SizedDeltaDirection4:
push {r4,r5,lr}
sub sp, 0x8
adds r4, r1, 0
@ -941,17 +941,17 @@ _08002DD8:
str r0, [sp, 0x4]
_08002DDC:
mov r0, sp
bl sub_8002CF0
bl VecDirection4Radial
lsls r0, 24
asrs r0, 24
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8002D54
thumb_func_end SizedDeltaDirection4
thumb_func_start sub_8002DF0
sub_8002DF0:
thumb_func_start SizedDeltaDirection8
SizedDeltaDirection8:
push {r4,r5,lr}
sub sp, 0x8
adds r4, r1, 0
@ -1027,13 +1027,13 @@ _08002E74:
str r0, [sp, 0x4]
_08002E78:
mov r0, sp
bl sub_8002C60
bl VecDirection8Radial
lsls r0, 24
asrs r0, 24
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8002DF0
thumb_func_end SizedDeltaDirection8
.align 2, 0 @ Don't pad with nop.

4
asm/code_800DAC0.s
View File

@ -56,7 +56,7 @@ _0800DD60:
b _0800DE28
_0800DD64:
mov r0, r8
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
movs r4, 0
ldr r0, [r5, 0x8]
movs r1, 0x7
@ -633,7 +633,7 @@ _0800E1D2:
adds r4, 0x55
ldrb r4, [r4]
str r4, [sp, 0x4]
bl sub_800543C
bl AxResInitUnorientedFile_800543C
b _0800E200
_0800E1E4:
adds r0, r5, 0

38
asm/code_800F990.s
View File

@ -21,7 +21,7 @@ sub_800F990:
movs r1, 0x14
bl sub_80095CC
movs r0, 0x2
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
ldr r1, [r4]
ldr r0, _0800FA2C
adds r2, r1, r0
@ -439,7 +439,7 @@ _0800FD08:
str r4, [sp, 0x8]
adds r0, r3, 0
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
b _0800FD32
.align 2, 0
_0800FD1C: .4byte gUnknown_203B0E4
@ -758,7 +758,7 @@ _0800FF60:
str r2, [sp, 0x8]
movs r2, 0
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
ldr r2, [r4]
ldr r1, _0800FFD4
adds r0, r2, r1
@ -948,7 +948,7 @@ sub_80100C0:
str r1, [sp, 0x8]
adds r1, r2, 0
movs r2, 0
bl sub_80053AC
bl AxResInitFile_80053AC
bl sub_8011168
ldr r0, [r4]
ldr r2, _080101E8
@ -1053,7 +1053,7 @@ _0801018A:
str r2, [sp, 0x8]
movs r2, 0
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
add sp, 0x18
pop {r3-r5}
mov r8, r3
@ -1091,7 +1091,7 @@ _08010214: .4byte gUnknown_80D3EFC
_08010218:
adds r0, r3, 0
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
_08010220:
pop {r0}
bx r0
@ -1157,7 +1157,7 @@ sub_8010268:
movs r1, 0x14
bl sub_80095CC
movs r0, 0x2
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
bl sub_801059C
adds r0, r5, 0x4
bl sub_8010494
@ -1318,7 +1318,7 @@ _080103B0:
movs r2, 0x1
str r2, [sp, 0x8]
movs r2, 0
bl sub_80053AC
bl AxResInitFile_80053AC
movs r7, 0
cmp r7, r4
bge _08010448
@ -1458,7 +1458,7 @@ _080104E6:
str r6, [sp, 0x8]
adds r0, r3, 0
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
ldr r1, _08010508
lsls r0, r5, 2
adds r0, r1
@ -1490,7 +1490,7 @@ _0801050E:
str r2, [sp, 0x8]
movs r2, 0
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
ldr r2, [r4]
ldr r4, _08010588
adds r3, r2, r4
@ -1675,7 +1675,7 @@ _080106A2:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
add sp, 0x14
pop {r3-r5}
mov r8, r3
@ -1942,9 +1942,9 @@ _0801089A:
_080108FC: .4byte gUnknown_203B0E8
_08010900: .4byte 0x000052da
_08010904: .4byte 0x000052d8
_08010908: .4byte gUnknown_202C038
_08010908: .4byte gFontTiles_202C038
_0801090C: .4byte 0x00003114
_08010910: .4byte gUnknown_202C838
_08010910: .4byte gFontTilesExtra_202C838
_08010914: .4byte 0x00001114
thumb_func_end sub_8010858
@ -1985,7 +1985,7 @@ sub_8010950:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
pop {r0}
bx r0
thumb_func_end sub_8010950
@ -2148,7 +2148,7 @@ sub_8010A88:
ldr r5, [r1]
ldr r3, _08010B64
adds r0, r3
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
mov r0, r9
cmp r0, 0
beq _08010AF6
@ -2194,7 +2194,7 @@ _08010B04:
adds r5, r4, 0
adds r5, 0x8
adds r0, r5, 0
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
mov r2, r9
cmp r2, 0
beq _08010B40
@ -2287,7 +2287,7 @@ _08010BD0:
add r0, sp, 0x4
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
bl sub_80073B8
ldr r0, _08010C08
@ -2389,7 +2389,7 @@ _08010C86:
adds r0, r3, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
bl sub_80073B8
str r4, [sp]
@ -2625,7 +2625,7 @@ _08010E84:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
add sp, 0xC
pop {r3-r5}
mov r8, r3

20
asm/code_8010F28.s
View File

@ -29,7 +29,7 @@ sub_8010F28:
mov r8, r1
ldr r4, _0801108C
adds r0, r4
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
ldr r3, [r6]
adds r4, r3, r4
ldr r7, _08011090
@ -74,7 +74,7 @@ _08010F98:
beq _08010FD8
adds r4, 0x14
adds r0, r4, 0
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
movs r2, 0x4
ldrsh r1, [r5, r2]
mov r3, r9
@ -114,7 +114,7 @@ _08010FEC:
cmp r0, 0
beq _08011062
adds r0, r1, r6
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
ldr r0, _080110A8
ldrh r0, [r0]
movs r2, 0x80
@ -278,9 +278,9 @@ _080110F2:
_08011150: .4byte gUnknown_203B0E4
_08011154: .4byte 0x00004dd6
_08011158: .4byte 0x00004dd4
_0801115C: .4byte gUnknown_202C038
_0801115C: .4byte gFontTiles_202C038
_08011160: .4byte 0x00002014
_08011164: .4byte gUnknown_202C838
_08011164: .4byte gFontTilesExtra_202C838
thumb_func_end sub_80110B0
thumb_func_start sub_8011168
@ -289,7 +289,7 @@ sub_8011168:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r3, _080111B0
ldr r1, [r3]
ldr r2, _080111B4
@ -557,7 +557,7 @@ _0801132E:
movs r3, 0x1
str r3, [sp, 0x8]
movs r3, 0
bl sub_80053AC
bl AxResInitFile_80053AC
_08011370:
adds r6, 0x3C
adds r5, 0x3C
@ -636,7 +636,7 @@ _08011406:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
bl sub_80073B8
ldr r1, _0801147C
@ -825,7 +825,7 @@ _0801152A:
add r0, sp, 0x4
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r1, [r5]
ldr r2, _08011628
adds r0, r1, r2
@ -888,7 +888,7 @@ _08011628: .4byte 0x00004ddc
_0801162C: .4byte 0x00004de0
_08011630: .4byte gUnknown_80D4104
_08011634: .4byte gFormatData_202DE30
_08011638: .4byte gUnknown_202DE58
_08011638: .4byte gFormatItems
_0801163C: .4byte gUnknown_80D4120
_08011640:
ldr r1, _08011690

24
asm/code_80140DC.s
View File

@ -159,7 +159,7 @@ _08014368:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r1, _080143F0
movs r4, 0
movs r2, 0
@ -188,7 +188,7 @@ _08014368:
movs r1, 0x8
_080143C6:
adds r0, r1, 0
bl sub_80063D8
bl SetCharacterMask
ldr r0, _080143F8
movs r1, 0x1
str r1, [r0]
@ -505,7 +505,7 @@ _08014652:
ldr r4, _08014698
adds r0, r6, 0
adds r1, r4, 0
bl sub_8009190
bl xxx_handle_format_global
adds r6, r0, 0
adds r0, r4, 0
adds r0, 0x21
@ -901,7 +901,7 @@ _08014978:
beq _080149A8
_08014998:
movs r0, 0
bl sub_8008C54
bl CallPrepareTextbox_8008C54
b _080149B6
.align 2, 0
_080149A0: .4byte gUnknown_202E748
@ -966,7 +966,7 @@ _08014A04:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r1, _08014A30
movs r0, 0
str r0, [r1]
@ -1107,7 +1107,7 @@ _08014B1E:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, _08014B80
ldr r1, _08014B84
ldr r1, [r1]
@ -1221,12 +1221,12 @@ _08014BEA:
adds r1, r4, 0
adds r2, r7, 0
mov r3, r8
bl sub_8014FA8
bl AppendString_8014FA8
ldr r0, _08014C20
adds r1, r4, 0
adds r2, r7, 0
mov r3, r8
bl sub_8014FA8
bl AppendString_8014FA8
b _08014C2E
.align 2, 0
_08014C1C: .4byte gUnknown_202E5D8
@ -1541,7 +1541,7 @@ _08014F0E:
adds r0, r4, 0
adds r2, r7, 0
mov r3, r8
bl sub_8014FA8
bl AppendString_8014FA8
lsls r0, 24
cmp r0, 0
bne _08014F7E
@ -1623,8 +1623,8 @@ _08014F94:
bx r1
thumb_func_end xxx_format_string
thumb_func_start sub_8014FA8
sub_8014FA8:
thumb_func_start AppendString_8014FA8
AppendString_8014FA8:
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@ -1665,7 +1665,7 @@ _08014FE8:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8014FA8
thumb_func_end AppendString_8014FA8
thumb_func_start PrintFormatStringOnWindow
PrintFormatStringOnWindow:

6
asm/code_8015080.s
View File

@ -380,7 +380,7 @@ _080154A0:
adds r0, r4
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0x1
bl sub_8015A08
bl sub_8015C1C
@ -1063,7 +1063,7 @@ sub_8015A08:
push {r5-r7}
sub sp, 0x24
movs r0, 0
bl sub_8008C54
bl CallPrepareTextbox_8008C54
movs r0, 0
bl sub_80073B8
ldr r3, _08015A68
@ -1325,7 +1325,7 @@ sub_8015C1C:
push {r4,r5,lr}
sub sp, 0x54
movs r0, 0x1
bl sub_8008C54
bl CallPrepareTextbox_8008C54
movs r0, 0x1
bl sub_80073B8
ldr r0, _08015C74

6
asm/code_801EE10.s
View File

@ -19,7 +19,7 @@ sub_801F280:
ldr r4, _0801F30C
ldr r0, [r4]
ldr r0, [r0, 0x50]
bl sub_8008C54
bl CallPrepareTextbox_8008C54
ldr r0, [r4]
ldr r0, [r0, 0x50]
bl sub_80073B8
@ -155,7 +155,7 @@ _0801F394:
cmp r0, 0
beq _0801F3DC
ldr r0, [r1, 0x54]
bl sub_8008C54
bl CallPrepareTextbox_8008C54
ldr r0, [r4]
ldr r0, [r0, 0x54]
bl sub_80073B8
@ -182,7 +182,7 @@ _0801F3DC:
pop {r0}
bx r0
.align 2, 0
_0801F3EC: .4byte gUnknown_202DE58
_0801F3EC: .4byte gFormatItems
_0801F3F0: .4byte gUnknown_203B270
_0801F3F4: .4byte gUnknown_80DC2A0
thumb_func_end sub_801F280

12
asm/code_8023868.s
View File

@ -170,7 +170,7 @@ _0802398E:
adds r1, r0, r1
str r1, [r2]
adds r0, r6
bl sub_8006518
bl RestoreUnkTextStruct_8006518
ldr r1, [r5]
adds r4, r1, r4
ldr r2, [r4]
@ -219,7 +219,7 @@ _08023A04:
adds r0, r6
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r4, [r5]
movs r0, 0xD6
lsls r0, 2
@ -408,7 +408,7 @@ sub_8023B7C:
adds r0, r1
movs r1, 0
movs r2, 0
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
bl sub_8023BD8
adds r2, r0, 0
ldr r0, [r5]
@ -557,7 +557,7 @@ sub_8023C60:
adds r0, r4
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, [r5]
bl MemoryFree
movs r0, 0
@ -660,7 +660,7 @@ _08023D38:
adds r0, r2
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
pop {r4,r5}
pop {r0}
bx r0
@ -683,7 +683,7 @@ sub_8023DA4:
lsls r5, 2
adds r0, r5
ldr r0, [r0]
bl sub_8008C54
bl CallPrepareTextbox_8008C54
ldr r0, [r4]
adds r0, r5
ldr r0, [r0]

12
asm/code_803B050.s
View File

@ -20,7 +20,7 @@ sub_803B050:
adds r1, 0x84
str r1, [r0, 0x38]
adds r0, 0x3C
bl sub_8006518
bl RestoreUnkTextStruct_8006518
ldr r1, [r4]
ldr r2, [r1, 0x34]
lsls r0, r2, 1
@ -42,7 +42,7 @@ sub_803B050:
adds r0, 0x3C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r2, 0
movs r3, 0
movs r7, 0xCB
@ -215,7 +215,7 @@ sub_803B1BC:
adds r0, 0x3C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@ -253,7 +253,7 @@ sub_803B204:
adds r0, 0x3C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, [r4]
movs r1, 0x1A
ldrsh r0, [r0, r1]
@ -284,7 +284,7 @@ sub_803B204:
adds r0, 0x3C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
pop {r4}
pop {r0}
bx r0
@ -299,7 +299,7 @@ sub_803B284:
ldr r6, _0803B338
ldr r0, [r6]
ldr r0, [r0, 0x34]
bl sub_8008C54
bl CallPrepareTextbox_8008C54
ldr r0, [r6]
ldr r0, [r0, 0x34]
bl sub_80073B8

4
asm/code_803C1D0.s
View File

@ -260,7 +260,7 @@ _0803C398:
movs r0, 0
movs r1, 0x47
movs r2, 0x1
bl sub_8001784
bl GetScriptVarArrayValue
negs r1, r0
orrs r1, r0
lsrs r5, r1, 31
@ -270,7 +270,7 @@ _0803C3BA:
movs r0, 0
movs r1, 0x47
movs r2, 0
bl sub_8001784
bl GetScriptVarArrayValue
cmp r0, 0
beq _0803C3CE
movs r5, 0x1

2
asm/code_803D110.s
View File

@ -1653,7 +1653,7 @@ _0803E156:
bx r0
.align 2, 0
_0803E170: .4byte gGameOptionsRef
_0803E174: .4byte gUnknown_202D038
_0803E174: .4byte gFontPalette
thumb_func_end sub_803E13C
thumb_func_start sub_803E178

8
asm/code_803E724.s
View File

@ -389,7 +389,7 @@ _0803EB70:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, _0803EB94
ldrb r0, [r0]
cmp r0, 0
@ -406,7 +406,7 @@ _0803EB98:
ldr r0, _0803EBB4
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
ldr r0, _0803EBB8
ldrb r0, [r0]
cmp r0, 0
@ -504,7 +504,7 @@ _0803EC66:
movs r1, 0
_0803EC6E:
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
b _0803EC84
.align 2, 0
_0803EC78: .4byte gUnknown_203B40C
@ -555,7 +555,7 @@ sub_803ECB4:
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
pop {r4,r5}
pop {r0}
bx r0

14
asm/code_8042B34.s
View File

@ -715,7 +715,7 @@ _0804300C:
movs r0, 0
bl sub_800DAC0
movs r0, 0x1
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
bl sub_803DF60
bl sub_803E02C
bl sub_8042E98
@ -767,7 +767,7 @@ _080430D8:
b _0804315E
.align 2, 0
_0804310C: .4byte gUnknown_203B40C
_08043110: .4byte gUnknown_203B41C
_08043110: .4byte gSerializedData_203B41C
_08043114: .4byte gDungeon
_08043118: .4byte 0x0001cedb
_0804311C: .4byte gUnknown_203B410
@ -995,7 +995,7 @@ _08043318:
strb r5, [r0]
cmp r6, 0
bne _08043346
bl sub_80840A4
bl YetAnotherRandom24
ldr r1, [r4]
movs r3, 0xD0
lsls r3, 3
@ -1184,7 +1184,7 @@ _08043390:
bl sub_80842F0
_080434A6:
bl sub_803D8F0
bl sub_8068658
bl LoadDungeonPokemonSprites
cmp r6, 0
bne _08043514
bl sub_80687AC
@ -1706,7 +1706,7 @@ _0804398C: .4byte gPtrClientFaintedMessage
_08043990: .4byte 0x00000222
_08043994: .4byte gDungeonNameBannerPalette
_08043998: .4byte gUnknown_203B40C
_0804399C: .4byte gUnknown_203B41C
_0804399C: .4byte gSerializedData_203B41C
_080439A0:
movs r0, 0x2
bl sub_8046F84
@ -1999,7 +1999,7 @@ _08043BFC:
str r0, [r1]
b _08043C32
.align 2, 0
_08043C20: .4byte gUnknown_203B41C
_08043C20: .4byte gSerializedData_203B41C
_08043C24: .4byte 0x00000644
_08043C28:
movs r0, 0x2
@ -2083,7 +2083,7 @@ _08043CAC:
bx r0
.align 2, 0
_08043CD0: .4byte gDungeon
_08043CD4: .4byte gUnknown_203B41C
_08043CD4: .4byte gSerializedData_203B41C
thumb_func_end xxx_dungeon_8042F6C
thumb_func_start sub_8043CD8

4
asm/code_80450F8.s
View File

@ -98,7 +98,7 @@ _0804540C:
bl sub_8069F54
lsls r0, 16
asrs r0, 16
bl sub_80687D0
bl GetSpriteData
str r0, [r4, 0x64]
mov r1, r9
lsls r0, r1, 4
@ -291,7 +291,7 @@ _0804557A:
bl sub_8069F54
lsls r0, 16
asrs r0, 16
bl sub_80687D0
bl GetSpriteData
str r0, [r4, 0x64]
adds r0, r4, 0
adds r0, 0x68

46
asm/code_8045A00.s
View File

@ -69,9 +69,9 @@ _08045E1E:
ldr r0, _08045E3C
b _08046048
.align 2, 0
_08045E34: .4byte gUnknown_202DE58
_08045E34: .4byte gFormatItems
_08045E38: .4byte gAvailablePokemonNames
_08045E3C: .4byte gUnknown_80F8F88
_08045E3C: .4byte gMonTerrifiedCouldntPickUpItem
_08045E40:
ldrb r0, [r5, 0x2]
bl GetItemCategory
@ -94,8 +94,8 @@ _08045E40:
ldr r0, _08045E78
b _08045FD0
.align 2, 0
_08045E74: .4byte gUnknown_202DE58
_08045E78: .4byte gUnknown_80F8FFC
_08045E74: .4byte gFormatItems
_08045E78: .4byte gPickedUpItem
_08045E7C:
ldr r0, _08045EA8
ldr r0, [r0]
@ -282,8 +282,8 @@ _08045FD0:
b _08045FF2
.align 2, 0
_08045FDC: .4byte 0x00ff0008
_08045FE0: .4byte gUnknown_202DE58
_08045FE4: .4byte gUnknown_80F8FC4
_08045FE0: .4byte gFormatItems
_08045FE4: .4byte gPickedUpItem2
_08045FE8:
ldr r0, _08045FFC
ldr r1, [r0]
@ -294,7 +294,7 @@ _08045FF2:
bl sub_8052EC0
b _080460E0
.align 2, 0
_08045FFC: .4byte gUnknown_80F8FF8
_08045FFC: .4byte gPickedUpItemToolbox
_08046000:
movs r4, 0
cmp r4, r8
@ -339,9 +339,9 @@ _08046048:
bl SendMessage
b _080460E0
.align 2, 0
_08046054: .4byte gUnknown_202DE58
_08046054: .4byte gFormatItems
_08046058: .4byte gAvailablePokemonNames
_0804605C: .4byte gUnknown_80F8F54
_0804605C: .4byte gMonSteppedOnItem
_08046060:
movs r0, 0xA5
lsls r0, 1
@ -363,8 +363,8 @@ _08046060:
ldr r0, _08046090
b _080460AC
.align 2, 0
_0804608C: .4byte gUnknown_202DE58
_08046090: .4byte gUnknown_80F8FC4
_0804608C: .4byte gFormatItems
_08046090: .4byte gPickedUpItem2
_08046094:
adds r0, r5, 0
bl AddItemToInventory
@ -383,7 +383,7 @@ _080460AC:
b _080460DA
.align 2, 0
_080460B8: .4byte gAvailablePokemonNames
_080460BC: .4byte gUnknown_80F8FAC
_080460BC: .4byte gMonCouldntPickUpItem
_080460C0:
ldr r0, _080460F0
adds r1, r5, 0
@ -408,8 +408,8 @@ _080460E0:
pop {r0}
bx r0
.align 2, 0
_080460F0: .4byte gUnknown_202DE58
_080460F4: .4byte gUnknown_80F8FF8
_080460F0: .4byte gFormatItems
_080460F4: .4byte gPickedUpItemToolbox
thumb_func_end sub_8045DB4
thumb_func_start sub_80460F8
@ -1128,7 +1128,7 @@ _08046644:
b _0804671E
.align 2, 0
_08046688: .4byte gUnknown_80F4468
_0804668C: .4byte gUnknown_202DE58
_0804668C: .4byte gFormatItems
_08046690:
cmp r0, 0x2
beq _080466A4
@ -1139,17 +1139,17 @@ _0804669A:
ldr r0, _080466A0
b _080466B6
.align 2, 0
_080466A0: .4byte gUnknown_80F93E8
_080466A0: .4byte gItemFellOnGround
_080466A4:
ldr r0, _080466A8
b _080466B6
.align 2, 0
_080466A8: .4byte gUnknown_80F9408
_080466A8: .4byte gItemFellInWater
_080466AC:
ldr r0, _080466B0
b _080466B6
.align 2, 0
_080466B0: .4byte gUnknown_80F9424
_080466B0: .4byte gItemBuried
_080466B4:
ldr r0, _080466C4
_080466B6:
@ -1159,7 +1159,7 @@ _080466B6:
bl sub_8052364
b _0804671E
.align 2, 0
_080466C4: .4byte gUnknown_80F949C
_080466C4: .4byte gItemFellOutOfSight
_080466C8:
mov r3, r8
lsls r1, r3, 16
@ -1213,7 +1213,7 @@ _0804671E:
pop {r0}
bx r0
.align 2, 0
_08046730: .4byte gUnknown_80F943C
_08046730: .4byte gItemLost
thumb_func_end sub_804652C
thumb_func_start sub_8046734
@ -1726,7 +1726,7 @@ _08046B0A:
.align 2, 0
_08046B2C: .4byte 0x0000052c
_08046B30: .4byte 0x000004b4
_08046B34: .4byte gUnknown_80F945C
_08046B34: .4byte gAllItemsLost
_08046B38: .4byte 0x00000524
_08046B3C:
ldr r0, _08046B4C
@ -1737,7 +1737,7 @@ _08046B3C:
bl SendMessage
b _08046C7C
.align 2, 0
_08046B4C: .4byte gUnknown_80F943C
_08046B4C: .4byte gItemLost
_08046B50: .4byte 0x00000524
_08046B54:
mov r0, r9
@ -1901,7 +1901,7 @@ _08046C7C:
pop {r0}
bx r0
.align 2, 0
_08046C90: .4byte gUnknown_80F947C
_08046C90: .4byte gSeveralItemsLost
_08046C94: .4byte 0x00000524
_08046C98: .4byte gDungeon
_08046C9C: .4byte 0x00018210

8
asm/code_8046CE4.s
View File

@ -447,7 +447,7 @@ _080474B8: .4byte 0x00000195
_080474BC: .4byte gDungeon
_080474C0: .4byte 0x0001c05e
_080474C4: .4byte gAvailablePokemonNames
_080474C8: .4byte gUnknown_202DE58
_080474C8: .4byte gFormatItems
_080474CC: .4byte gUnknown_80F94C4
_080474D0:
ldr r1, [sp, 0x260]
@ -479,7 +479,7 @@ _080474E2:
b _08047524
.align 2, 0
_0804750C: .4byte gAvailablePokemonNames
_08047510: .4byte gUnknown_202DE58
_08047510: .4byte gFormatItems
_08047514: .4byte gUnknown_80F94D8
_08047518:
ldr r0, _08047564
@ -565,7 +565,7 @@ _080475A8:
pop {r0}
bx r0
.align 2, 0
_080475BC: .4byte gUnknown_202DE58
_080475BC: .4byte gFormatItems
_080475C0: .4byte gUnknown_80F9530
thumb_func_end sub_8047190
@ -952,7 +952,7 @@ _080478B8:
b _08047904
.align 2, 0
_080478CC: .4byte 0xffffff00
_080478D0: .4byte gUnknown_202DE58
_080478D0: .4byte gFormatItems
_080478D4: .4byte gAvailablePokemonNames
_080478D8: .4byte gUnknown_80F94C4
_080478DC:

24
asm/code_80521D0.s
View File

@ -301,7 +301,7 @@ _080525D0:
_080525F2:
adds r0, r5, 0
add r1, sp, 0x4
bl sub_8009190
bl xxx_handle_format_global
adds r5, r0, 0
ldrb r0, [r5]
cmp r0, 0
@ -950,7 +950,7 @@ _08052B14:
ldrh r3, [r1]
movs r1, 0
mov r2, r9
bl sub_80141B4
bl xxx_info_box_80141B4
_08052B3C:
bl xxx_draw_string_80144C4
movs r0, 0x9
@ -1565,7 +1565,7 @@ _08053016:
_08053030: .4byte gUnknown_202B038
_08053034: .4byte gUnknown_202F1F0
_08053038: .4byte 0x0000f3ff
_0805303C: .4byte gUnknown_202D038
_0805303C: .4byte gFontPalette
_08053040:
movs r2, 0x1
add r9, r2
@ -1685,7 +1685,7 @@ _08053134:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0x9
bl sub_803E46C
bl sub_8040238
@ -1712,7 +1712,7 @@ _0805314C:
pop {r0}
bx r0
.align 2, 0
_08053178: .4byte gUnknown_202D038
_08053178: .4byte gFontPalette
thumb_func_end sub_8052FB8
thumb_func_start sub_805317C
@ -6585,7 +6585,7 @@ _08055BBA:
str r1, [sp, 0x4]
b _08055C26
.align 2, 0
_08055C08: .4byte gUnknown_202DE58
_08055C08: .4byte gFormatItems
_08055C0C: .4byte gUnknown_80F93C8
_08055C10: .4byte gUnknown_202F208
_08055C14: .4byte 0x00000159
@ -6798,7 +6798,7 @@ _08055DB4:
.align 2, 0
_08055DC4: .4byte gUnknown_80FC6A4
_08055DC8: .4byte 0x0000ffff
_08055DCC: .4byte gUnknown_202DE58
_08055DCC: .4byte gFormatItems
_08055DD0: .4byte gUnknown_80FD2DC
_08055DD4: .4byte gUnknown_202F222
_08055DD8: .4byte gUnknown_80F4E70
@ -7187,7 +7187,7 @@ _0805610C: .4byte 0x00003a0e
_08056110: .4byte gNaturePowerMoveTable
_08056114: .4byte gUnknown_80FECE0
_08056118: .4byte gAvailablePokemonNames
_0805611C: .4byte gUnknown_202DE58
_0805611C: .4byte gFormatItems
_08056120: .4byte gUnknown_80FC72C
_08056124:
mov r0, r10
@ -7272,7 +7272,7 @@ _080561A0:
b _08056188
.align 2, 0
_080561D4: .4byte gAvailablePokemonNames
_080561D8: .4byte gUnknown_202DE58
_080561D8: .4byte gFormatItems
_080561DC: .4byte gUnknown_80FC6D0
_080561E0:
ldr r0, _0805620C
@ -7293,7 +7293,7 @@ _080561E0:
bl SendMessage
b _08056190
.align 2, 0
_0805620C: .4byte gUnknown_202DE58
_0805620C: .4byte gFormatItems
_08056210: .4byte gUnknown_80FC6FC
_08056214:
ldr r0, _0805625C
@ -7643,7 +7643,7 @@ _080564BC:
b _080564F2
.align 2, 0
_080564DC: .4byte gAvailablePokemonNames
_080564E0: .4byte gUnknown_202DE58
_080564E0: .4byte gFormatItems
_080564E4:
ldr r0, _08056508
ldr r2, [sp, 0x24]
@ -7662,7 +7662,7 @@ _080564F2:
bl sub_805239C
b _08056518
.align 2, 0
_08056508: .4byte gUnknown_202DE58
_08056508: .4byte gFormatItems
_0805650C: .4byte 0x00000163
_08056510:
adds r0, r6, 0

26
asm/code_805D8C8.s
View File

@ -1587,7 +1587,7 @@ _08062650:
adds r5, r0, 0
b _080626EA
.align 2, 0
_080626CC: .4byte gUnknown_202DE58
_080626CC: .4byte gFormatItems
_080626D0: .4byte gUnknown_80FE95C
_080626D4:
movs r0, 0x2
@ -1717,7 +1717,7 @@ _0806276C:
adds r5, r0, 0
b _080627FE
.align 2, 0
_080627E0: .4byte gUnknown_202DE58
_080627E0: .4byte gFormatItems
_080627E4: .4byte gUnknown_80FE960
_080627E8:
movs r0, 0x2
@ -1866,7 +1866,7 @@ sub_806285C:
add r4, sp, 0x4
b _08062938
.align 2, 0
_0806291C: .4byte gUnknown_202DE58
_0806291C: .4byte gFormatItems
_08062920: .4byte gUnknown_80FE964
_08062924:
movs r0, 0x2
@ -2165,7 +2165,7 @@ sub_8062B74:
ldr r0, [r0, 0x70]
mov r9, r0
movs r0, 0x2
bl sub_8008C54
bl CallPrepareTextbox_8008C54
movs r0, 0x2
bl sub_80073B8
ldr r0, _08062BD0
@ -2305,7 +2305,7 @@ _08062C8A:
pop {r0}
bx r0
.align 2, 0
_08062CA0: .4byte gUnknown_202DE58
_08062CA0: .4byte gFormatItems
_08062CA4: .4byte gUnknown_8106C98
thumb_func_end sub_8062B74
@ -2316,7 +2316,7 @@ sub_8062CA8:
adds r4, r0, 0
ldr r5, [r4, 0x70]
movs r0, 0x2
bl sub_8008C54
bl CallPrepareTextbox_8008C54
movs r0, 0x2
bl sub_80073B8
ldr r0, _08062CF8
@ -2401,7 +2401,7 @@ _08062D52:
pop {r0}
bx r0
.align 2, 0
_08062D60: .4byte gUnknown_202DE58
_08062D60: .4byte gFormatItems
_08062D64: .4byte gUnknown_8106C98
thumb_func_end sub_8062CA8
@ -3543,7 +3543,7 @@ _08063676:
pop {r0}
bx r0
.align 2, 0
_0806368C: .4byte gUnknown_202DE58
_0806368C: .4byte gFormatItems
_08063690: .4byte gUnknown_202EE10
_08063694: .4byte gUnknown_8106CC4
thumb_func_end sub_8063578
@ -4127,7 +4127,7 @@ _08063AEC:
.align 2, 0
_08063B1C: .4byte gDungeon
_08063B20: .4byte 0x0001357c
_08063B24: .4byte gUnknown_202DE58
_08063B24: .4byte gFormatItems
_08063B28: .4byte 0x00000133
_08063B2C: .4byte gUnknown_80F8B40
_08063B30:
@ -4192,7 +4192,7 @@ sub_8063B54:
.align 2, 0
_08063BA4: .4byte gDungeon
_08063BA8: .4byte 0x0001357c
_08063BAC: .4byte gUnknown_202DE58
_08063BAC: .4byte gFormatItems
_08063BB0: .4byte 0x00000133
thumb_func_end sub_8063B54
@ -4294,7 +4294,7 @@ _08063C5C:
.align 2, 0
_08063C70: .4byte gDungeon
_08063C74: .4byte 0x0001357c
_08063C78: .4byte gUnknown_202DE58
_08063C78: .4byte gFormatItems
_08063C7C: .4byte 0x00000119
_08063C80: .4byte gUnknown_202DEA8
_08063C84: .4byte 0x00000133
@ -4447,7 +4447,7 @@ _08063D70:
.align 2, 0
_08063D98: .4byte gDungeon
_08063D9C: .4byte 0x0001357c
_08063DA0: .4byte gUnknown_202DE58
_08063DA0: .4byte gFormatItems
_08063DA4: .4byte 0x00000119
_08063DA8: .4byte 0x00000133
_08063DAC: .4byte gUnknown_80F8B88
@ -4906,7 +4906,7 @@ _08064130:
b _0806414E
.align 2, 0
_08064140: .4byte gUnknown_202F2D8
_08064144: .4byte gUnknown_202DE58
_08064144: .4byte gFormatItems
_08064148: .4byte gUnknown_80FDF00
_0806414C:
ldr r0, _0806415C

4
asm/code_805D8C8_1.s
View File

@ -648,7 +648,7 @@ _08068E1C:
ldr r0, _08068E78
mov r1, r8
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
ldr r0, _08068E7C
ldr r1, [r0]
movs r0, 0
@ -690,7 +690,7 @@ _08068E52:
movs r0, 0x1
b _08068E82
.align 2, 0
_08068E78: .4byte gUnknown_202DE58
_08068E78: .4byte gFormatItems
_08068E7C: .4byte gUnknown_80FE1A4
_08068E80:
movs r0, 0

80
asm/code_8066D04.s
View File

@ -54,7 +54,7 @@ _08066E54:
ldr r0, _08066E7C
b _08066F1E
.align 2, 0
_08066E78: .4byte gUnknown_202DE58
_08066E78: .4byte gFormatItems
_08066E7C: .4byte gUnknown_80F8BE0
_08066E80:
ldr r1, [sp, 0x8]
@ -74,7 +74,7 @@ _08066E80:
b _08066F1E
.align 2, 0
_08066EA0: .4byte gUnknown_202DEA8
_08066EA4: .4byte gUnknown_80F8C48
_08066EA4: .4byte gItemStickyCannotMove3
_08066EA8:
mov r2, r9
movs r3, 0x4
@ -91,7 +91,7 @@ _08066EA8:
ldr r0, _08066EC8
b _08066F1E
.align 2, 0
_08066EC8: .4byte gUnknown_80F8E54
_08066EC8: .4byte gNoExchangesHere
_08066ECC:
adds r0, r6, 0
ldr r5, [r0]
@ -139,7 +139,7 @@ _08066F1E:
b _08066F7E
.align 2, 0
_08066F28: .4byte 0xffffff00
_08066F2C: .4byte gUnknown_80F8E78
_08066F2C: .4byte gNothingCanBePutDownHere
_08066F30:
ldr r3, [sp, 0x8]
ldrb r0, [r3]
@ -185,9 +185,9 @@ _08066F7E:
pop {r0}
bx r0
.align 2, 0
_08066F90: .4byte gUnknown_202DE58
_08066F90: .4byte gFormatItems
_08066F94: .4byte 0x0000014d
_08066F98: .4byte gUnknown_80F8EAC
_08066F98: .4byte gSwappedGroundItem
_08066F9C: .4byte gDungeon
_08066FA0: .4byte 0x00003a08
thumb_func_end sub_8066E14
@ -236,8 +236,8 @@ sub_8066FA4:
ldr r0, _08067004
b _0806709E
.align 2, 0
_08067000: .4byte gUnknown_202DE58
_08067004: .4byte gUnknown_80F8C48
_08067000: .4byte gFormatItems
_08067004: .4byte gItemStickyCannotMove3
_08067008:
mov r0, r9
adds r0, 0x48
@ -254,7 +254,7 @@ _08067008:
ldr r0, _08067024
b _0806709E
.align 2, 0
_08067024: .4byte gUnknown_80F8C44
_08067024: .4byte gItemStickyCannotMove2
_08067028:
mov r1, r10
ldr r0, [r1, 0x14]
@ -266,7 +266,7 @@ _08067028:
ldr r0, _0806703C
b _0806709E
.align 2, 0
_0806703C: .4byte gUnknown_80F8E54
_0806703C: .4byte gNoExchangesHere
_08067040:
mov r2, r10
ldr r0, [r2, 0x14]
@ -319,7 +319,7 @@ _0806709E:
.align 2, 0
_080670A8: .4byte gUnknown_202DEA8
_080670AC: .4byte 0xffffff00
_080670B0: .4byte gUnknown_80F8E78
_080670B0: .4byte gNothingCanBePutDownHere
_080670B4:
ldr r1, [sp, 0x8]
ldrb r0, [r1]
@ -358,7 +358,7 @@ _080670EE:
bx r0
.align 2, 0
_08067100: .4byte 0x0000014d
_08067104: .4byte gUnknown_80F8EAC
_08067104: .4byte gSwappedGroundItem
_08067108: .4byte gDungeon
_0806710C: .4byte 0x00003a08
thumb_func_end sub_8066FA4
@ -421,7 +421,7 @@ _08067188:
pop {r0}
bx r0
.align 2, 0
_08067190: .4byte gUnknown_202DE58
_08067190: .4byte gFormatItems
_08067194: .4byte gAvailablePokemonNames
_08067198: .4byte gDungeon
_0806719C: .4byte 0x00003a08
@ -459,7 +459,7 @@ sub_80671A0:
ldr r0, _080671E4
b _08067230
.align 2, 0
_080671E0: .4byte gUnknown_202DE58
_080671E0: .4byte gFormatItems
_080671E4: .4byte gUnknown_80F8BE0
_080671E8:
ldrb r0, [r4, 0x2]
@ -485,7 +485,7 @@ _08067202:
ldr r0, _0806721C
b _08067230
.align 2, 0
_08067218: .4byte gUnknown_202DE58
_08067218: .4byte gFormatItems
_0806721C: .4byte gUnknown_80F8BE0
_08067220:
adds r0, r6, 0
@ -680,9 +680,9 @@ _08067384:
bl SendMessage
b _080673C6
.align 2, 0
_080673B0: .4byte gUnknown_202DE58
_080673B0: .4byte gFormatItems
_080673B4: .4byte gAvailablePokemonNames
_080673B8: .4byte gUnknown_80F8EC8
_080673B8: .4byte gMonThrewItem2
_080673BC:
ldr r0, _080673F8
ldr r1, [r0]
@ -712,7 +712,7 @@ _080673C6:
str r1, [sp, 0xC]
b _08067408
.align 2, 0
_080673F8: .4byte gUnknown_80F8EC4
_080673F8: .4byte gMonThrewItem1
_080673FC: .4byte 0xffff00ff
_08067400:
ldr r1, _0806741C
@ -908,7 +908,7 @@ sub_8067558:
movs r0, 0
b _08067716
.align 2, 0
_08067578: .4byte gUnknown_80F8EE4
_08067578: .4byte gCannotTalk
_0806757C:
adds r0, r6, 0
bl sub_8070BC0
@ -920,7 +920,7 @@ _0806757C:
movs r0, 0
b _08067716
.align 2, 0
_08067590: .4byte gUnknown_80F8EE4
_08067590: .4byte gCannotTalk
_08067594:
adds r0, r6, 0
adds r1, r5, 0
@ -1126,7 +1126,7 @@ _0806772A:
pop {r0}
bx r0
.align 2, 0
_08067738: .4byte gUnknown_80F8EE4
_08067738: .4byte gCannotTalk
thumb_func_end sub_8067558
thumb_func_start sub_806773C
@ -1193,7 +1193,7 @@ sub_8067794:
bl PrintFieldMessage
b _0806786C
.align 2, 0
_080677B0: .4byte gUnknown_80F8F08
_080677B0: .4byte gCannotFarewell
_080677B4:
ldr r0, _080677F0
adds r1, r7, 0
@ -1225,12 +1225,12 @@ _080677B4:
b _08067832
.align 2, 0
_080677F0: .4byte gAvailablePokemonNames
_080677F4: .4byte gUnknown_80F9094
_080677F4: .4byte gSayFarewellQ
_080677F8: .4byte gUnknown_80F913C
_080677FC: .4byte gRecruitedPokemonRef
_08067800: .4byte 0x00008df8
_08067804: .4byte gUnknown_80F9114
_08067808: .4byte gUnknown_80F9154
_08067808: .4byte gMonDisappointedAndLeft
_0806780C:
movs r2, 0xA
ldrsh r0, [r4, r2]
@ -1245,7 +1245,7 @@ _0806780C:
ldr r0, _08067828
b _0806782E
.align 2, 0
_08067828: .4byte gUnknown_80F90DC
_08067828: .4byte gSendMonBackQ
_0806782C:
ldr r0, _08067874
_0806782E:
@ -1283,8 +1283,8 @@ _0806786C:
pop {r0}
bx r0
.align 2, 0
_08067874: .4byte gUnknown_80F90C8
_08067878: .4byte gUnknown_80F9150
_08067874: .4byte gSendMonBackWithItemQ
_08067878: .4byte gMonWentBack
_0806787C: .4byte gAvailablePokemonNames
_08067880: .4byte 0x0000021d
thumb_func_end sub_8067794
@ -1386,7 +1386,7 @@ sub_8067904:
.align 2, 0
_08067940: .4byte gUnknown_202F208
_08067944: .4byte gAvailablePokemonNames
_08067948: .4byte gUnknown_80F8F20
_08067948: .4byte gMonCringing
_0806794C:
adds r0, r6, 0
adds r0, 0xAC
@ -1405,7 +1405,7 @@ _08067962:
b _08067A56
.align 2, 0
_0806796C: .4byte gAvailablePokemonNames
_08067970: .4byte gUnknown_80F8F38
_08067970: .4byte gMonParalyzed
_08067974:
movs r0, 0xB0
lsls r0, 1
@ -2118,7 +2118,7 @@ sub_8067F00:
ldr r0, _08067F44
adds r1, r4, 0
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
ldr r2, _08067F48
movs r0, 0
str r0, [sp]
@ -2164,7 +2164,7 @@ _08067F4C:
.align 2, 0
_08067F8C: .4byte gAvailablePokemonNames
_08067F90: .4byte gFormatData_202DE30
_08067F94: .4byte gUnknown_202DE58
_08067F94: .4byte gFormatItems
_08067F98: .4byte gUnknown_8106E2C
_08067F9C:
ldr r0, _08067FCC
@ -2191,7 +2191,7 @@ _08067FA4:
bl PrintFormatStringOnWindow
b _08067FE6
.align 2, 0
_08067FCC: .4byte gUnknown_202DE58
_08067FCC: .4byte gFormatItems
_08067FD0: .4byte gUnknown_8106E30
_08067FD4: .4byte gUnknown_8106E34
_08067FD8:
@ -3010,8 +3010,8 @@ _08068650: .4byte gDungeon
_08068654: .4byte 0x000181e4
thumb_func_end sub_806863C
thumb_func_start sub_8068658
sub_8068658:
thumb_func_start LoadDungeonPokemonSprites
LoadDungeonPokemonSprites:
push {r4-r6,lr}
movs r4, 0
ldr r6, _08068740
@ -3029,7 +3029,7 @@ _08068664:
ble _08068664
ldr r0, _0806874C
movs r1, 0x1
bl sub_8068838
bl LoadPokemonSprite
movs r4, 0
ldr r1, _08068744
ldr r0, [r1]
@ -3047,7 +3047,7 @@ _08068690:
lsls r0, 16
asrs r0, 16
movs r1, 0x1
bl sub_8068838
bl LoadPokemonSprite
adds r5, 0x8
adds r4, 0x1
ldr r0, [r6]
@ -3067,7 +3067,7 @@ _080686B2:
cmp r0, 0
beq _080686CA
movs r1, 0x1
bl sub_8068838
bl LoadPokemonSprite
_080686CA:
movs r4, 0
ldr r6, _08068758
@ -3091,7 +3091,7 @@ _080686D0:
movs r2, 0xE
ldrsh r0, [r1, r2]
movs r1, 0
bl sub_8068838
bl LoadPokemonSprite
_080686F8:
adds r4, 0x1
cmp r4, 0x3
@ -3121,7 +3121,7 @@ _08068712:
movs r1, 0x8
ldrsh r0, [r2, r1]
movs r1, 0x1
bl sub_8068838
bl LoadPokemonSprite
_08068732:
adds r4, 0x1
cmp r4, 0x3
@ -3141,6 +3141,6 @@ _08068758: .4byte gRecruitedPokemonRef
_0806875C: .4byte 0x00008df8
_08068760: .4byte 0x00003a14
_08068764: .4byte 0x00008f88
thumb_func_end sub_8068658
thumb_func_end LoadDungeonPokemonSprites
.align 2,0

24
asm/code_8069E0C.s
View File

@ -719,7 +719,7 @@ _0806A87A:
pop {r0}
bx r0
.align 2, 0
_0806A890: .4byte gUnknown_202DE58
_0806A890: .4byte gFormatItems
_0806A894: .4byte gUnknown_80FEAC4
thumb_func_end sub_806A7E8
@ -3234,7 +3234,7 @@ sub_806BB6C:
ldr r0, [r7, 0x70]
strh r5, [r0, 0x2]
adds r0, r2, 0
bl sub_80687D0
bl GetSpriteData
str r0, [r7, 0x64]
adds r1, r7, 0
adds r1, 0x6A
@ -4677,12 +4677,12 @@ _0806C6A8:
ldr r4, [sp, 0x38]
str r4, [sp, 0x8]
adds r0, r5, 0
bl sub_80053AC
bl AxResInitFile_80053AC
mov r10, r5
b _0806C704
_0806C6D6:
ldr r0, _0806C774
bl sub_80687D0
bl GetSpriteData
adds r5, r0, 0
bl Rand32Bit
movs r1, 0x3
@ -4699,7 +4699,7 @@ _0806C6D6:
str r1, [sp, 0x8]
adds r0, r4, 0
adds r1, r5, 0
bl sub_80053AC
bl AxResInitFile_80053AC
mov r10, r4
_0806C704:
mov r2, r9
@ -4749,12 +4749,12 @@ _0806C73C:
cmp r0, 0
beq _0806C76A
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
_0806C76A:
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
b _0806C7E2
.align 2, 0
_0806C774: .4byte 0x000001a5
@ -4780,9 +4780,9 @@ _0806C784:
cmp r0, 0
bne _0806C7BC
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
b _0806C7DC
.align 2, 0
_0806C7B4: .4byte 0x0000066c
@ -4803,10 +4803,10 @@ _0806C7C8:
cmp r0, 0x1
ble _0806C7DC
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
_0806C7DC:
mov r0, r10
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
_0806C7E2:
ldr r1, [r6, 0xC]
ldr r0, [r6, 0x14]

10
asm/code_80718D8.s
View File

@ -197,7 +197,7 @@ _08071F02:
beq _08071EF8
movs r2, 0
ldrsh r0, [r5, r2]
bl sub_80687D0
bl GetSpriteData
ldr r1, [sp, 0xD0]
cmp r0, 0
beq _08071EF8
@ -305,7 +305,7 @@ _08071FE2:
.align 2, 0
_08071FF4: .4byte gFormatData_202DE30
_08071FF8: .4byte gAvailablePokemonNames
_08071FFC: .4byte gUnknown_202DE58
_08071FFC: .4byte gFormatItems
_08072000: .4byte gUnknown_80FF730
_08072004: .4byte 0x00000149
thumb_func_end sub_8071DA4
@ -496,7 +496,7 @@ _08072162:
.align 2, 0
_08072174: .4byte gFormatData_202DE30
_08072178: .4byte gAvailablePokemonNames
_0807217C: .4byte gUnknown_202DE58
_0807217C: .4byte gFormatItems
_08072180: .4byte gUnknown_80FF730
_08072184: .4byte 0x00000149
_08072188: .4byte gUnknown_80F9B74
@ -1439,7 +1439,7 @@ _08072894:
b _08072928
.align 2, 0
_080728C8: .4byte gAvailablePokemonNames
_080728CC: .4byte gUnknown_202DE58
_080728CC: .4byte gFormatItems
_080728D0: .4byte gUnknown_80F9F04
_080728D4:
mov r1, r8
@ -1634,7 +1634,7 @@ _08072A0C:
b _08072A8C
.align 2, 0
_08072A44: .4byte gAvailablePokemonNames
_08072A48: .4byte gUnknown_202DE58
_08072A48: .4byte gFormatItems
_08072A4C: .4byte gUnknown_80F9F04
_08072A50:
movs r0, 0

2
asm/code_807E5AC.s
View File

@ -434,7 +434,7 @@ _0807E9D8:
ldrsh r0, [r4, r1]
cmp r0, r9
beq _0807E9FE
bl sub_80687D0
bl GetSpriteData
str r0, [r5, 0x64]
adds r0, r5, 0
bl sub_806CEBC

2
asm/code_807FCD4.s
View File

@ -85,7 +85,7 @@ _08080848:
bl sub_80522F4
b _08080870
.align 2, 0
_0808085C: .4byte gUnknown_202DE58
_0808085C: .4byte gFormatItems
_08080860: .4byte gUnknown_80FDB04
_08080864:
ldr r0, _08080880

4
asm/code_8080CF0.s
View File

@ -780,7 +780,7 @@ _0808294A:
ldr r0, [r7, 0x70]
strb r5, [r0, 0x6]
mov r0, r8
bl sub_80687D0
bl GetSpriteData
str r0, [r7, 0x64]
lsls r0, r4, 4
adds r0, 0x40
@ -939,7 +939,7 @@ _08082A70:
ldr r0, [r7, 0x70]
strb r4, [r0, 0x6]
mov r0, r9
bl sub_80687D0
bl GetSpriteData
str r0, [r7, 0x64]
mov r1, r8
lsls r0, r1, 4

2
asm/code_808417C.s
View File

@ -405,7 +405,7 @@ _080844F0:
_080844FC: .4byte gDungeon
_08084500: .4byte 0x0000068a
_08084504: .4byte gUnknown_80FA32C
_08084508: .4byte gUnknown_202DE58
_08084508: .4byte gFormatItems
_0808450C: .4byte gTeamInventoryRef
_08084510: .4byte gUnknown_80FA448
_08084514:

134
asm/code_8098468.s
View File

@ -32,7 +32,7 @@ xxx_script_related_8098468:
_08098494: .4byte gUnknown_20398B4
_08098498: .4byte gUnknown_20398B9
_0809849C: .4byte gUnknown_20398B8
_080984A0: .4byte gUnknown_20398BA
_080984A0: .4byte gScriptMode
_080984A4: .4byte _080984A8
.align 2, 0
_080984A8:
@ -60,7 +60,7 @@ _080984D4:
add r2, sp, 0x4
movs r0, 0x3
mov r1, sp
bl sub_8001B88
bl GetScriptVarScenario
ldr r2, _080984F4
movs r1, 0
ldr r0, [sp]
@ -101,7 +101,7 @@ _08098522:
adds r0, r2, 0
strh r0, [r1]
movs r0, 0
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
bl sub_8099648
bl sub_809975C
bl sub_809D0AC
@ -113,10 +113,10 @@ _08098522:
bl sub_809CB50
bl AllocGroundMapAction
bl nullsub_117
bl sub_80AD990
bl sub_80A77F8
bl sub_80ABB54
bl sub_80ACB90
bl AllocGroundEvents
bl AllocGroundLives
bl AllocGroundObjects
bl AllocGroundEffects
bl sub_809A62C
ldr r0, _080985BC
movs r1, 0
@ -136,11 +136,11 @@ _08098522:
ldr r5, _080985D0
movs r0, 0
movs r1, 0xD
bl sub_8001658
bl GetScriptVarValue
strh r0, [r5]
movs r0, 0
movs r1, 0xE
bl sub_8001658
bl GetScriptVarValue
ldr r1, _080985D4
str r0, [r1]
ldr r0, _080985D8
@ -219,20 +219,20 @@ _0809866A:
ldr r2, [r0]
movs r0, 0
movs r1, 0x16
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x25
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
bl sub_8098C58
movs r0, 0
movs r1, 0x15
movs r2, 0x1
movs r3, 0x2
bl sub_800226C
bl UpdateScriptVarWithImmediate
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r4, r0, 16
movs r0, 0x1
@ -243,16 +243,16 @@ _0809866A:
bne _080986C0
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_80A2608
bl GetDungeonInfo_80A2608
b _080986C6
.align 2, 0
_080986BC: .4byte gUnknown_20398B4
_080986C0:
adds r0, r4, 0
bl sub_80A2608
bl GetDungeonInfo_80A2608
_080986C6:
movs r1, 0xA
ldrsh r7, [r0, r1]
@ -265,7 +265,7 @@ _080986C6:
movs r0, 0
movs r1, 0x31
movs r3, 0x1
bl sub_800199C
bl SetScriptVarArrayValue
_080986E0:
ldr r0, [r5]
bl sub_8098FCC
@ -293,19 +293,19 @@ _0809870C:
movs r0, 0
movs r1, 0x18
movs r2, 0x1
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0xF
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0xD
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0xE
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
movs r7, 0x71
b _08098756
.align 2, 0
@ -328,13 +328,13 @@ _08098756:
bne _080987C0
movs r0, 0
movs r1, 0xD
bl sub_8001658
bl GetScriptVarValue
adds r5, r0, 0
ldr r4, _08098794
ldr r2, [r4]
movs r0, 0
movs r1, 0x18
bl sub_80018D8
bl SetScriptVarValue
ldr r4, [r4]
cmp r4, 0x1
beq _080987A6
@ -345,7 +345,7 @@ _08098756:
ldrsh r2, [r0, r1]
movs r0, 0
movs r1, 0xF
bl sub_80018D8
bl SetScriptVarValue
b _080987A6
.align 2, 0
_08098790: .4byte gUnknown_20398B9
@ -355,19 +355,19 @@ _0809879C:
movs r0, 0
movs r1, 0xF
adds r2, r5, 0
bl sub_80018D8
bl SetScriptVarValue
_080987A6:
ldr r0, _0809882C
movs r1, 0
ldrsh r2, [r0, r1]
movs r0, 0
movs r1, 0xD
bl sub_80018D8
bl SetScriptVarValue
ldr r0, _08098830
ldr r2, [r0]
movs r0, 0
movs r1, 0xE
bl sub_80018D8
bl SetScriptVarValue
_080987C0:
ldr r1, _08098834
movs r0, 0x2
@ -394,10 +394,10 @@ _080987C0:
bl sub_809A62C
bl GroundMap_Reset
bl sub_809D0BC
bl DeleteBlankGroundEvents
bl DeleteBlankGroundLives
bl DeleteBlankGroundObjects
bl DeleteBlankGroundEffects
bl DeleteGroundEvents
bl DeleteGroundLives
bl DeleteGroundObjects
bl DeleteGroundEffects
bl sub_809C658
bl nullsub_16
bl sub_8097944
@ -541,10 +541,10 @@ _08098988:
_08098990:
bl FreeGroundMapAction
bl nullsub_118
bl sub_80A78F0
bl sub_80ABBD4
bl sub_80ACC10
bl sub_80ADA08
bl FreeGroundLives
bl FreeGroundObjects
bl FreeGroundEffects
bl FreeGroundEvents
bl sub_809CB74
bl sub_809A610
bl sub_809C618
@ -605,46 +605,46 @@ _08098A30:
movs r0, 0
movs r1, 0x13
adds r2, r4, 0
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x14
adds r2, r4, 0
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x18
movs r2, 0x4
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x4
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0xD
bl sub_8001658
bl GetScriptVarValue
adds r2, r0, 0
movs r0, 0
movs r1, 0xF
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x5
b _08098BD2
_08098A72:
movs r0, 0
movs r1, 0x13
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x18
movs r2, 0x5
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x5
bl sub_80018D8
bl SetScriptVarValue
movs r2, 0x1
negs r2, r2
movs r0, 0
movs r1, 0x13
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x6
b _08098BD2
_08098AA0:
@ -659,27 +659,27 @@ _08098AA0:
ldrsh r2, [r5, r0]
movs r0, 0
movs r1, 0x13
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x14
adds r2, r4, 0
bl sub_80018D8
bl SetScriptVarValue
ldrh r2, [r5]
movs r0, 0
movs r1, 0x30
movs r3, 0x1
bl sub_800199C
bl SetScriptVarArrayValue
movs r0, 0
movs r1, 0x18
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x11
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
cmp r0, 0xA
@ -687,7 +687,7 @@ _08098AA0:
movs r0, 0
movs r1, 0x11
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
_08098B00:
movs r0, 0x7
b _08098BD2
@ -697,24 +697,24 @@ _08098B08:
movs r0, 0
movs r1, 0x13
movs r2, 0x51
bl sub_80018D8
bl SetScriptVarValue
ldr r0, _08098B54
movs r1, 0
ldrsh r2, [r0, r1]
movs r0, 0
movs r1, 0x14
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x18
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x11
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
cmp r0, 0xA
@ -722,7 +722,7 @@ _08098B08:
movs r0, 0
movs r1, 0x11
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
_08098B4E:
movs r0, 0x8
b _08098BD2
@ -732,20 +732,20 @@ _08098B58:
movs r0, 0
movs r1, 0x13
movs r2, 0x50
bl sub_80018D8
bl SetScriptVarValue
ldr r0, _08098B88
ldrb r2, [r0]
movs r0, 0
movs r1, 0x14
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x18
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x9
b _08098BD2
.align 2, 0
@ -754,21 +754,21 @@ _08098B8C:
movs r0, 0
movs r1, 0x13
movs r2, 0x52
bl sub_80018D8
bl SetScriptVarValue
ldr r0, _08098BBC
movs r1, 0
ldrsh r2, [r0, r1]
movs r0, 0
movs r1, 0x14
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x18
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0
movs r1, 0x16
movs r2, 0x7
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0xA
b _08098BD2
.align 2, 0
@ -777,7 +777,7 @@ _08098BC0:
movs r0, 0
movs r1, 0x18
movs r2, 0x1
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x10
bl FadeOutAllMusic
movs r0, 0xE

36
asm/code_8098BDC.s
View File

@ -15,7 +15,7 @@ sub_80990EC:
lsls r1, 16
asrs r4, r1, 16
adds r0, r4, 0
bl sub_80A2608
bl GetDungeonInfo_80A2608
mov r8, r0
ldrb r0, [r0, 0xC]
movs r5, 0
@ -229,11 +229,11 @@ sub_809927C:
movs r0, 0
movs r1, 0x13
movs r2, 0x50
bl sub_80018D8
bl SetScriptVarValue
ldrb r2, [r4]
movs r0, 0
movs r1, 0x14
bl sub_80018D8
bl SetScriptVarValue
ldr r4, _080992DC
adds r0, r4, 0
adds r1, r5, 0
@ -263,7 +263,7 @@ sub_80992E0:
adds r5, r1, 0
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r1, r0, 16
movs r0, 0x1
@ -279,7 +279,7 @@ sub_80992E0:
strh r1, [r4]
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
strh r0, [r5]
movs r0, 0x1
b _08099322
@ -302,17 +302,17 @@ sub_8099328:
adds r4, r0, 0
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
cmp r0, 0x51
bne _08099358
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_80A2608
bl GetDungeonInfo_80A2608
ldrb r0, [r0, 0xC]
cmp r0, 0x3E
bhi _08099358
@ -333,7 +333,7 @@ sub_8099360:
adds r4, r0, 0
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
cmp r0, 0x52
@ -343,10 +343,10 @@ sub_8099360:
_08099378:
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_80A2608
bl GetDungeonInfo_80A2608
ldrb r0, [r0, 0xC]
strb r0, [r4]
movs r0, 0x1
@ -362,7 +362,7 @@ sub_8099394:
adds r4, r0, 0
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
cmp r0, 0x50
@ -372,7 +372,7 @@ sub_8099394:
_080993AC:
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
strb r0, [r4]
movs r0, 0x1
_080993B8:
@ -432,14 +432,14 @@ sub_80993F0:
adds r0, r2, 0
strh r0, [r1]
movs r0, 0
bl xxx_update_some_bg_tiles
bl UpdateFadeInTile
movs r0, 0
movs r1, 0x14
bl sub_80095CC
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
movs r1, 0x14
bl sub_8009408
@ -500,7 +500,7 @@ _080994B0:
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
bl GroundMap_Reset
bl sub_809D0BC
mov r0, r10
@ -574,7 +574,7 @@ _08099540:
add r0, sp, 0x10
movs r2, 0x80
lsls r2, 1
bl sub_8002BB8
bl SetVecFromDirectionSpeed
ldr r2, [sp, 0x10]
ldr r3, [sp, 0x14]
movs r0, 0x2
@ -739,7 +739,7 @@ sub_8099690:
_080996BC: .4byte gUnknown_8116028
_080996C0: .4byte gSystemFileArchive
_080996C4: .4byte gGameOptionsRef
_080996C8: .4byte gUnknown_202D078
_080996C8: .4byte gFontPaletteAlt
_080996CC:
ldr r4, _080996D0
b _080996D6

144
asm/code_809A560.s
View File

@ -354,7 +354,7 @@ _0809ABA0:
.align 2, 0
_0809ABA8: .4byte gAvailablePokemonNames
_0809ABAC: .4byte gPlayerName
_0809ABB0: .4byte gUnknown_811617C
_0809ABB0: .4byte gSpeechBubbleChar
thumb_func_end sub_809AB4C
thumb_func_start sub_809ABB4
@ -767,7 +767,7 @@ _0809AEA4:
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809AED4
ldr r0, [r0]
adds r0, 0xC
@ -777,7 +777,7 @@ _0809AEA4:
ldrh r1, [r1]
adds r2, r6, 0
adds r3, r4, 0
bl sub_809B2B8
bl ScriptPrintText_809B2B8
b _0809AEE0
.align 2, 0
_0809AED0: .4byte gUnknown_8116134
@ -804,7 +804,7 @@ sub_809AEEC:
beq _0809AF1C
movs r0, 0x2
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809AF18
ldr r0, [r0]
adds r0, 0xC
@ -812,7 +812,7 @@ sub_809AEEC:
negs r2, r2
movs r1, 0xC2
adds r3, r4, 0
bl sub_809B2B8
bl ScriptPrintText_809B2B8
b _0809AF20
.align 2, 0
_0809AF18: .4byte gUnknown_3001B64
@ -837,7 +837,7 @@ sub_809AF2C:
beq _0809AF5C
movs r0, 0x2
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809AF58
ldr r0, [r0]
adds r0, 0xC
@ -845,7 +845,7 @@ sub_809AF2C:
negs r2, r2
movs r1, 0xC2
adds r3, r4, 0
bl sub_809B2B8
bl ScriptPrintText_809B2B8
b _0809AF60
.align 2, 0
_0809AF58: .4byte gUnknown_3001B64
@ -870,7 +870,7 @@ sub_809AF6C:
beq _0809AF9C
movs r0, 0x3
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809AF98
ldr r0, [r0]
adds r0, 0xC
@ -878,7 +878,7 @@ sub_809AF6C:
negs r2, r2
movs r1, 0x65
adds r3, r4, 0
bl sub_809B2B8
bl ScriptPrintText_809B2B8
b _0809AFA0
.align 2, 0
_0809AF98: .4byte gUnknown_3001B64
@ -983,7 +983,7 @@ sub_809B028:
adds r0, r1
ldr r0, [r0]
movs r1, 0
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809B088
ldr r1, [r0]
ldr r0, _0809B08C
@ -1050,7 +1050,7 @@ _0809B09A:
_0809B0D4: .4byte gUnknown_3001B64
_0809B0D8: .4byte gUnknown_8116148
_0809B0DC: .4byte gUnknown_202E5D8
_0809B0E0: .4byte gUnknown_8116180
_0809B0E0: .4byte gFormattedSpeechBubble
_0809B0E4:
ldr r0, _0809B134
ldr r1, _0809B138
@ -1205,7 +1205,7 @@ _0809B1F8:
_0809B202:
movs r0, 0x4
movs r1, 0
bl sub_809A680
bl xxx_script_textboxes_809A680
ldr r0, _0809B254
ldr r1, [r0]
ldr r2, _0809B258
@ -1280,11 +1280,11 @@ _0809B288:
_0809B290: .4byte gUnknown_3001B64
thumb_func_end sub_809B260
thumb_func_start sub_809B294
sub_809B294:
thumb_func_start ResetTextbox_809B294
ResetTextbox_809B294:
push {lr}
movs r0, 0x3
bl sub_80063D8
bl SetCharacterMask
ldr r0, _0809B2B4
ldr r0, [r0]
adds r0, 0xC
@ -1292,15 +1292,15 @@ sub_809B294:
negs r2, r2
movs r1, 0
movs r3, 0
bl sub_809B2B8
bl ScriptPrintText_809B2B8
pop {r0}
bx r0
.align 2, 0
_0809B2B4: .4byte gUnknown_3001B64
thumb_func_end sub_809B294
thumb_func_end ResetTextbox_809B294
thumb_func_start sub_809B2B8
sub_809B2B8:
thumb_func_start ScriptPrintText_809B2B8
ScriptPrintText_809B2B8:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -1330,7 +1330,7 @@ _0809B2E8:
bl sub_8014490
movs r0, 0
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
b _0809B3FA
_0809B2F6:
movs r0, 0x1
@ -1347,7 +1347,7 @@ _0809B2F6:
b _0809B32A
.align 2, 0
_0809B310: .4byte gUnknown_202E5D8
_0809B314: .4byte gUnknown_8116180
_0809B314: .4byte gFormattedSpeechBubble
_0809B318:
ldr r0, _0809B3D0
ldr r1, _0809B3D4
@ -1473,10 +1473,10 @@ _0809B3FC:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_809B2B8
thumb_func_end ScriptPrintText_809B2B8
thumb_func_start sub_809B40C
sub_809B40C:
thumb_func_start IsTextboxOpen_809B40C
IsTextboxOpen_809B40C:
push {lr}
ldr r0, [r0, 0x4]
cmp r0, 0
@ -1493,7 +1493,7 @@ _0809B420:
_0809B422:
pop {r1}
bx r1
thumb_func_end sub_809B40C
thumb_func_end IsTextboxOpen_809B40C
thumb_func_start sub_809B428
sub_809B428:
@ -1583,7 +1583,7 @@ _0809B4B0:
ldr r0, [r4, 0x4]
cmp r0, 0
beq _0809B4F2
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r4, 0x4]
bl _call_via_r0
lsls r0, 24
@ -1602,7 +1602,7 @@ _0809B4B0:
_0809B4E8:
movs r0, 0
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
b _0809B56E
_0809B4F2:
ldrh r0, [r4]
@ -1667,7 +1667,7 @@ _0809B558:
str r1, [r0]
movs r0, 0
movs r1, 0x1
bl sub_809A680
bl xxx_script_textboxes_809A680
_0809B56E:
bl sub_809B57C
pop {r4-r6}
@ -1703,7 +1703,7 @@ sub_809B57C:
bne _0809B5E4
ldr r1, [sp]
movs r0, 0x1
bl sub_809D9E0
bl GroundScriptLock
ldr r1, [r5]
adds r2, r1, r4
movs r0, 0x3
@ -1723,7 +1723,7 @@ _0809B5CC:
cmp r4, 0
bne _0809B5E4
movs r0, 0
bl sub_809D9B8
bl GroundScriptLockJumpZero
ldr r0, _0809B5FC
ldr r0, [r0]
str r4, [r0]
@ -1899,7 +1899,7 @@ _0809B772:
cmp r0, 0x1
bne _0809B78A
_0809B780:
bl sub_809B294
bl ResetTextbox_809B294
_0809B784:
movs r0, 0x1
bl _0809C394
@ -1927,7 +1927,7 @@ _0809B7AC:
ldr r0, [r0]
cmp r0, 0x1
bne _0809B7F4
bl sub_809B294
bl ResetTextbox_809B294
ldr r1, [r6]
ldr r2, _0809B7D8
adds r0, r1, r2
@ -1990,7 +1990,7 @@ _0809B834:
ldr r0, [r0]
cmp r0, 0x1
bne _0809B85C
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r6]
ldr r1, _0809B858
adds r0, r1
@ -2039,7 +2039,7 @@ _0809B89C:
ldr r0, [r0]
cmp r0, 0x1
bne _0809B8C4
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r6]
ldr r3, _0809B8C0
adds r0, r3
@ -2111,7 +2111,7 @@ _0809B932:
_0809B93C: .4byte 0x0000042c
_0809B940: .4byte gUnknown_81161B8
_0809B944:
bl sub_809B294
bl ResetTextbox_809B294
ldr r4, _0809B984
ldr r0, [r4]
movs r2, 0x84
@ -2120,7 +2120,7 @@ _0809B944:
ldr r0, [r0]
cmp r0, 0x1
bne _0809B998
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r4]
ldr r3, _0809B988
adds r0, r3
@ -2175,7 +2175,7 @@ _0809B9BC:
bl sub_80151A4
bl _0809C392
_0809B9D2:
bl sub_809B294
bl ResetTextbox_809B294
ldr r4, _0809BA08
ldr r0, [r4]
movs r1, 0x84
@ -2184,7 +2184,7 @@ _0809B9D2:
ldr r0, [r0]
cmp r0, 0x1
bne _0809BA1C
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r4]
ldr r2, _0809BA0C
adds r0, r2
@ -2222,7 +2222,7 @@ _0809BA2A:
ldr r0, [r0]
cmp r0, 0x1
bne _0809BA68
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r6]
ldr r2, _0809BA5C
adds r0, r2
@ -2282,13 +2282,13 @@ _0809BAA8:
bne _0809BB10
movs r0, 0
movs r1, 0x12
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_80A2654
lsls r0, 16
asrs r4, r0, 16
bl sub_809B294
bl ResetTextbox_809B294
movs r0, 0x3
movs r1, 0
movs r2, 0xA
@ -2315,7 +2315,7 @@ _0809BAEA:
movs r0, 0
movs r1, 0x12
adds r2, r5, 0
bl sub_80018D8
bl SetScriptVarValue
_0809BB08:
movs r0, 0x4
bl PlayMenuSoundEffect
@ -2340,7 +2340,7 @@ _0809BB20:
asrs r2, 16
movs r0, 0
movs r1, 0x12
bl sub_80018D8
bl SetScriptVarValue
ldr r0, [r6]
movs r3, 0x86
lsls r3, 3
@ -2366,7 +2366,7 @@ _0809BB66:
ldr r0, [r0]
cmp r0, 0x1
bne _0809BB9A
bl sub_809B294
bl ResetTextbox_809B294
movs r0, 0x3
movs r1, 0
movs r2, 0xA
@ -2420,7 +2420,7 @@ _0809BBDA:
ldr r0, [r0]
cmp r0, 0x1
bne _0809BC14
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, [r6]
ldr r2, _0809BC10
adds r0, r2
@ -2430,7 +2430,7 @@ _0809BBDA:
movs r0, 0
movs r1, 0x18
movs r2, 0x1
bl sub_80018D8
bl SetScriptVarValue
_0809BC02:
movs r0, 0x1
bl sub_8011C28
@ -2456,7 +2456,7 @@ _0809BC26:
negs r4, r0
orrs r4, r0
lsrs r4, 31
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl CreateKangaskhanStorage
lsls r0, 24
@ -2495,7 +2495,7 @@ _0809BC78:
negs r4, r0
orrs r4, r0
lsrs r4, 31
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl CreateFelicityBank
lsls r0, 24
@ -2522,7 +2522,7 @@ _0809BCBC:
bl sub_80023E4
lsls r0, 24
lsrs r4, r0, 24
bl sub_809B294
bl ResetTextbox_809B294
ldr r0, _0809BCE0
ldr r0, [r0]
ldr r2, _0809BCE4
@ -2571,7 +2571,7 @@ _0809BD1C:
negs r4, r0
orrs r4, r0
lsrs r4, 31
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl sub_801FB50
lsls r0, 24
@ -2604,10 +2604,10 @@ _0809BD64:
ldr r0, [r0]
cmp r0, 0x1
bne _0809BD84
bl sub_809B294
bl ResetTextbox_809B294
movs r0, 0
movs r1, 0x39
bl sub_80015C0
bl ClearScriptVarArray
bl sub_802465C
b _0809B784
_0809BD84:
@ -2615,7 +2615,7 @@ _0809BD84:
adds r4, r0, 0
movs r0, 0
movs r1, 0x39
bl sub_8001658
bl GetScriptVarValue
cmp r0, 0
bne _0809BDB2
bl HasEvolutionCompleted
@ -2625,7 +2625,7 @@ _0809BD84:
movs r0, 0
movs r1, 0x39
movs r2, 0x1
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x46
movs r1, 0
bl GroundMap_ExecuteEvent
@ -2663,7 +2663,7 @@ _0809BDE8:
negs r4, r0
orrs r4, r0
lsrs r4, 31
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl CreateWigglytuffShop
lsls r0, 24
@ -2716,7 +2716,7 @@ _0809BE50:
.align 2, 0
_0809BE5C: .4byte gUnknown_8116248
_0809BE60:
bl sub_809B294
bl ResetTextbox_809B294
movs r0, 0x98
lsls r0, 1
bl CreateHelperPelipperMenu
@ -2777,7 +2777,7 @@ _0809BED4:
add r1, sp, 0x4
add r2, sp, 0x8
movs r0, 0x2
bl sub_8001B88
bl GetScriptVarScenario
ldr r0, [sp, 0x8]
cmp r0, 0x7
bgt _0809BF4E
@ -2858,7 +2858,7 @@ _0809BF82:
add r1, sp, 0x14
add r2, sp, 0x18
movs r0, 0x2
bl sub_8001B88
bl GetScriptVarScenario
add r4, sp, 0x1C
ldr r1, [sp, 0x18]
lsls r1, 24
@ -2883,18 +2883,18 @@ _0809BFA4:
_0809BFB8:
movs r0, 0
movs r1, 0x19
bl sub_8001658
bl GetScriptVarValue
cmp r0, 0x63
bgt _0809BFCE
adds r2, r0, 0x1
movs r0, 0
movs r1, 0x19
bl sub_80018D8
bl SetScriptVarValue
_0809BFCE:
movs r0, 0
movs r1, 0x39
movs r2, 0x1
bl sub_80018D8
bl SetScriptVarValue
ldr r1, [sp, 0x14]
ldr r2, [sp, 0x18]
adds r2, 0x1
@ -2927,7 +2927,7 @@ _0809BFFC:
asrs r4, 31
movs r0, 0x4
ands r4, r0
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl MakuhitaDojo_New
lsls r0, 24
@ -2974,7 +2974,7 @@ _0809C072:
beq _0809C082
movs r4, 0x5
_0809C082:
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl MakuhitaDojo_New
lsls r0, 24
@ -3008,7 +3008,7 @@ _0809C0B8:
beq _0809C0C8
movs r4, 0x6
_0809C0C8:
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl MakuhitaDojo_New
lsls r0, 24
@ -3039,7 +3039,7 @@ _0809C0FC:
beq _0809C10C
movs r4, 0x7
_0809C10C:
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r4, 0
bl MakuhitaDojo_New
lsls r0, 24
@ -3083,7 +3083,7 @@ _0809C158:
.align 2, 0
_0809C164: .4byte gUnknown_81162D8
_0809C168:
bl sub_809B294
bl ResetTextbox_809B294
bl sub_803B050
lsls r0, 24
cmp r0, 0
@ -3124,7 +3124,7 @@ _0809C1BC:
str r1, [r0]
b _0809C392
_0809C1C2:
bl sub_809B294
bl ResetTextbox_809B294
b _0809C392
_0809C1C8:
movs r0, 0x2
@ -3187,7 +3187,7 @@ _0809C238:
ldr r3, _0809C26C
adds r0, r3
ldrb r4, [r0]
bl sub_809B294
bl ResetTextbox_809B294
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
@ -3220,11 +3220,11 @@ _0809C280:
ldr r0, [r0]
cmp r0, 0x1
bne _0809C2B8
bl sub_809B294
bl ResetTextbox_809B294
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
bl xxx_call_save_unk_text_struct_800641C
movs r0, 0
movs r1, 0
movs r2, 0
@ -3272,7 +3272,7 @@ _0809C2CA:
b _0809C318
.align 2, 0
_0809C304: .4byte gTeamInventoryRef
_0809C308: .4byte gUnknown_202DE58
_0809C308: .4byte gFormatItems
_0809C30C:
ldr r0, [r6]
movs r3, 0x86
@ -3300,7 +3300,7 @@ _0809C32A:
ldr r0, [r0]
cmp r0, 0x1
bne _0809C36C
bl sub_809B294
bl ResetTextbox_809B294
ldr r1, [r4]
ldr r3, _0809C368
adds r0, r1, r3

6
asm/code_809C5C4.s
View File

@ -107,7 +107,7 @@ _0809CC82:
pop {r1}
bx r1
.align 2, 0
_0809CC8C: .4byte gUnknown_202DE58
_0809CC8C: .4byte gFormatItems
thumb_func_end sub_809CBBC
thumb_func_start sub_809CC90
@ -209,7 +209,7 @@ _0809CD44: .4byte gUnknown_20399E0
thumb_func_start sub_809CD48
sub_809CD48:
push {lr}
bl sub_809A750
bl IsTextboxOpen_809A750
lsls r0, 24
cmp r0, 0
bne _0809CD58
@ -505,7 +505,7 @@ _0809CF4E:
b _0809CFDA
_0809CF54:
movs r0, 0x2
bl sub_809D9B8
bl GroundScriptLockJumpZero
b _0809CFCC
_0809CF5C:
add r0, sp, 0x4

6
asm/code_80A26CC_1.s
View File

@ -3633,8 +3633,8 @@ sub_80A4620:
_080A4638: .4byte 0x00000449
thumb_func_end sub_80A4620
thumb_func_start sub_80A463C
sub_80A463C:
thumb_func_start GetDungeonBounds
GetDungeonBounds:
movs r3, 0
str r3, [r1]
str r3, [r1, 0x4]
@ -3652,7 +3652,7 @@ sub_80A463C:
bx lr
.align 2, 0
_080A465C: .4byte 0x00000449
thumb_func_end sub_80A463C
thumb_func_end GetDungeonBounds
thumb_func_start sub_80A4660
sub_80A4660:

2
asm/dungeon_2.s
View File

@ -323,7 +323,7 @@ _080905D0: .4byte gUnknown_8115C4C
_080905D4: .4byte gUnknown_8108F42
_080905D8: .4byte gUnknown_8108F4A
_080905DC: .4byte gDungeons
_080905E0: .4byte gUnknown_202DE58
_080905E0: .4byte gFormatItems
_080905E4: .4byte gUnknown_8115CB8
_080905E8:
ldr r0, _080906A0

8
asm/dungeon_map_access.s
View File

@ -701,7 +701,7 @@ _0804A0E8: .4byte 0x00011884
_0804A0EC: .4byte 0x00012bda
_0804A0F0: .4byte 0x00012bec
_0804A0F4: .4byte 0x00012bfe
_0804A0F8: .4byte gUnknown_202C838
_0804A0F8: .4byte gFontTilesExtra_202C838
_0804A0FC:
movs r1, 0x80
lsls r1, 5
@ -1062,7 +1062,7 @@ _0804A386:
b _0804A476
.align 2, 0
_0804A3AC: .4byte 0x00011884
_0804A3B0: .4byte gUnknown_202C838
_0804A3B0: .4byte gFontTilesExtra_202C838
_0804A3B4: .4byte 0x00012bda
_0804A3B8:
movs r3, 0x80
@ -1395,7 +1395,7 @@ _0804A60C:
b _0804A702
.align 2, 0
_0804A638: .4byte 0x00011884
_0804A63C: .4byte gUnknown_202C838
_0804A63C: .4byte gFontTilesExtra_202C838
_0804A640: .4byte 0x00012bda
_0804A644:
movs r2, 0x80
@ -1809,7 +1809,7 @@ _0804A92C:
b _0804AA20
.align 2, 0
_0804A968: .4byte 0x00013554
_0804A96C: .4byte gUnknown_202C038
_0804A96C: .4byte gFontTiles_202C038
_0804A970: .4byte 0x00012b92
_0804A974:
lsls r0, r5, 1

74
asm/event_flag.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_8001570
sub_8001570:
thumb_func_start ResetScriptVarArray
ResetScriptVarArray:
push {r4-r7,lr}
adds r7, r0, 0
lsls r1, 16
@ -19,7 +19,7 @@ sub_8001570:
b _08001590
.align 2, 0
_08001584: .4byte 0x000003ff
_08001588: .4byte gUnknown_80B7394
_08001588: .4byte gScriptVarInfo
_0800158C:
lsls r1, r6, 4
ldr r0, _08001598
@ -35,7 +35,7 @@ _0800159C:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r4, 0
bl sub_800199C
bl SetScriptVarArrayValue
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -47,10 +47,10 @@ _080015B0:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8001570
thumb_func_end ResetScriptVarArray
thumb_func_start sub_80015C0
sub_80015C0:
thumb_func_start ClearScriptVarArray
ClearScriptVarArray:
push {r4-r7,lr}
adds r7, r0, 0
lsls r1, 16
@ -63,7 +63,7 @@ sub_80015C0:
b _080015E0
.align 2, 0
_080015D4: .4byte 0x000003ff
_080015D8: .4byte gUnknown_80B7394
_080015D8: .4byte gScriptVarInfo
_080015DC:
lsls r1, r6, 4
ldr r0, _080015E8
@ -78,7 +78,7 @@ _080015EC:
adds r1, r6, 0
adds r2, r4, 0
movs r3, 0
bl sub_800199C
bl SetScriptVarArrayValue
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@ -90,10 +90,10 @@ _080015FE:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80015C0
thumb_func_end ClearScriptVarArray
thumb_func_start sub_800160C
sub_800160C:
thumb_func_start GetScriptVarRef
GetScriptVarRef:
push {r4,lr}
adds r3, r0, 0
adds r4, r1, 0
@ -113,8 +113,8 @@ sub_800160C:
b _0800164C
.align 2, 0
_08001630: .4byte 0x000003ff
_08001634: .4byte gUnknown_80B7394
_08001638: .4byte gUnknown_2000A88
_08001634: .4byte gScriptVarInfo
_08001638: .4byte gScriptVarBuffer
_0800163C:
lsls r1, 4
ldr r0, _08001654
@ -131,10 +131,10 @@ _0800164C:
bx r0
.align 2, 0
_08001654: .4byte 0x080b2d30
thumb_func_end sub_800160C
thumb_func_end GetScriptVarRef
thumb_func_start sub_8001658
sub_8001658:
thumb_func_start GetScriptVarValue
GetScriptVarValue:
push {r4,lr}
sub sp, 0x8
adds r2, r0, 0
@ -143,7 +143,7 @@ sub_8001658:
mov r0, sp
adds r1, r2, 0
adds r2, r4, 0
bl sub_800160C
bl GetScriptVarRef
ldr r0, [sp]
ldrh r0, [r0]
subs r0, 0x1
@ -235,7 +235,7 @@ _08001700:
.4byte _08001754
.4byte _08001764
_08001734:
bl sub_8098F94
bl GetScriptMode
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@ -245,11 +245,11 @@ _0800173E:
lsrs r0, 31
b _0800177A
_08001746:
bl sub_808D480
bl GetFriendSum_808D480
b _0800177A
_0800174C:
movs r0, 0
bl sub_808D544
bl GetUnitSum_808D544
b _0800177A
_08001754:
ldr r0, _08001760
@ -277,11 +277,11 @@ _0800177A:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8001658
thumb_func_end GetScriptVarValue
@ https://decomp.me/scratch/xF3HH
thumb_func_start sub_8001784
sub_8001784:
thumb_func_start GetScriptVarArrayValue
GetScriptVarArrayValue:
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
@ -292,7 +292,7 @@ sub_8001784:
mov r0, sp
adds r1, r3, 0
adds r2, r5, 0
bl sub_800160C
bl GetScriptVarRef
ldr r0, [sp]
ldrh r0, [r0]
subs r0, 0x1
@ -399,7 +399,7 @@ _08001850:
.4byte _080018A4
.4byte _080018B8
_08001884:
bl sub_8098F94
bl GetScriptMode
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@ -409,11 +409,11 @@ _0800188E:
lsrs r0, 31
b _080018CE
_08001896:
bl sub_808D480
bl GetFriendSum_808D480
b _080018CE
_0800189C:
movs r0, 0
bl sub_808D544
bl GetUnitSum_808D544
b _080018CE
_080018A4:
ldr r0, _080018B4
@ -442,10 +442,10 @@ _080018CE:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8001784
thumb_func_end GetScriptVarArrayValue
thumb_func_start sub_80018D8
sub_80018D8:
thumb_func_start SetScriptVarValue
SetScriptVarValue:
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
@ -455,7 +455,7 @@ sub_80018D8:
mov r0, sp
adds r1, r3, 0
adds r2, r5, 0
bl sub_800160C
bl GetScriptVarRef
ldr r0, [sp]
ldrh r0, [r0]
subs r0, 0x1
@ -545,10 +545,10 @@ _08001990:
bx r0
.align 2, 0
_08001998: .4byte gTeamInventoryRef
thumb_func_end sub_80018D8
thumb_func_end SetScriptVarValue
thumb_func_start sub_800199C
sub_800199C:
thumb_func_start SetScriptVarArrayValue
SetScriptVarArrayValue:
push {r4-r7,lr}
sub sp, 0x8
adds r4, r0, 0
@ -560,7 +560,7 @@ sub_800199C:
mov r0, sp
adds r1, r4, 0
adds r2, r7, 0
bl sub_800160C
bl GetScriptVarRef
ldr r0, [sp]
ldrh r0, [r0]
subs r0, 0x1
@ -659,6 +659,6 @@ _08001A68:
bx r0
.align 2, 0
_08001A70: .4byte gTeamInventoryRef
thumb_func_end sub_800199C
thumb_func_end SetScriptVarArrayValue
.align 2, 0 @ Don't pad with nop.

206
asm/ground_effect.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80ACB90
sub_80ACB90:
thumb_func_start AllocGroundEffects
AllocGroundEffects:
push {r4,r5,lr}
ldr r4, _080ACBCC
movs r0, 0xE2
@ -32,17 +32,17 @@ _080ACBB0:
adds r1, r4
cmp r0, 0xF
ble _080ACBB0
bl DeleteBlankGroundEffects
bl DeleteGroundEffects
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080ACBCC: .4byte gUnknown_3001B8C
_080ACBCC: .4byte gGroundEffects
_080ACBD0: .4byte 0x0000ffff
thumb_func_end sub_80ACB90
thumb_func_end AllocGroundEffects
thumb_func_start DeleteBlankGroundEffects
DeleteBlankGroundEffects:
thumb_func_start DeleteGroundEffects
DeleteGroundEffects:
push {r4-r6,lr}
ldr r0, _080ACC0C
ldr r4, [r0]
@ -73,13 +73,13 @@ _080ACBF2:
pop {r0}
bx r0
.align 2, 0
_080ACC0C: .4byte gUnknown_3001B8C
thumb_func_end DeleteBlankGroundEffects
_080ACC0C: .4byte gGroundEffects
thumb_func_end DeleteGroundEffects
thumb_func_start sub_80ACC10
sub_80ACC10:
thumb_func_start FreeGroundEffects
FreeGroundEffects:
push {r4,lr}
bl DeleteBlankGroundEffects
bl DeleteGroundEffects
ldr r4, _080ACC28
ldr r0, [r4]
bl MemoryFree
@ -89,8 +89,8 @@ sub_80ACC10:
pop {r0}
bx r0
.align 2, 0
_080ACC28: .4byte gUnknown_3001B8C
thumb_func_end sub_80ACC10
_080ACC28: .4byte gGroundEffects
thumb_func_end FreeGroundEffects
thumb_func_start GroundEffect_Select
GroundEffect_Select:
@ -105,7 +105,7 @@ GroundEffect_Select:
asrs r6, r2, 24
ldr r1, _080ACC90
adds r0, r4, 0
bl sub_80A77D0
bl GetGroundScript
adds r5, r0, 0
ldr r1, _080ACC94
str r6, [sp]
@ -204,7 +204,7 @@ _080ACCE2:
bx r0
.align 2, 0
_080ACD00: .4byte gUnknown_8118640
_080ACD04: .4byte gUnknown_3001B8C
_080ACD04: .4byte gGroundEffects
thumb_func_end GroundEffect_Cancel
thumb_func_start GroundEffect_CancelBlank
@ -243,7 +243,7 @@ _080ACD2C:
lsls r1, 1
adds r0, r4, r1
mov r1, sp
bl sub_80A675C
bl IsOnscreen_80A675C
lsls r0, 24
cmp r0, 0
bne _080ACD5C
@ -267,7 +267,7 @@ _080ACD5C:
bx r0
.align 2, 0
_080ACD7C: .4byte gUnknown_8118658
_080ACD80: .4byte gUnknown_3001B8C
_080ACD80: .4byte gGroundEffects
thumb_func_end GroundEffect_CancelBlank
thumb_func_start sub_80ACD84
@ -291,7 +291,7 @@ _080ACD9A:
adds r0, r3, 0
b _080ACDBC
.align 2, 0
_080ACDA8: .4byte gUnknown_3001B8C
_080ACDA8: .4byte gGroundEffects
_080ACDAC:
adds r0, r2, 0
adds r2, r5
@ -343,8 +343,8 @@ GroundEffect_Add:
movs r6, 0
b _080ACE38
.align 2, 0
_080ACE08: .4byte gFunctionScriptData
_080ACE0C: .4byte gUnknown_3001B8C
_080ACE08: .4byte gGroundEffectTypes
_080ACE0C: .4byte gGroundEffects
_080ACE10:
adds r0, r2, 0x1
lsls r0, 16
@ -582,7 +582,7 @@ _080ACFD2:
adds r0, 0x28
adds r1, r5, 0
adds r1, 0x30
bl sub_80A5778
bl GetCurrentDungeonBounds
ldr r0, [sp, 0xC]
cmp r0, 0
beq _080AD01A
@ -646,7 +646,7 @@ _080AD04C:
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl sub_809D8C0
bl ExecutePredefinedScript
_080AD060:
adds r0, r6, 0
_080AD062:
@ -659,7 +659,7 @@ _080AD062:
pop {r1}
bx r1
.align 2, 0
_080AD074: .4byte gUnknown_8118544
_080AD074: .4byte gGroundEffectCallbacks
_080AD078: .4byte gFunctionScriptTable
_080AD07C: .4byte gUnknown_81186CC
thumb_func_end GroundEffect_Add
@ -687,14 +687,14 @@ GroundEffect_Delete:
bl sub_80A7714
adds r0, r4, 0
adds r0, 0x38
bl sub_809D648
bl InitAction2
ldr r0, _080AD0C4
strh r0, [r4, 0x6]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080AD0BC: .4byte gUnknown_3001B8C
_080AD0BC: .4byte gGroundEffects
_080AD0C0: .4byte gUnknown_81186D8
_080AD0C4: .4byte 0x0000ffff
thumb_func_end GroundEffect_Delete
@ -733,7 +733,7 @@ _080AD102:
pop {r0}
bx r0
.align 2, 0
_080AD108: .4byte gUnknown_3001B8C
_080AD108: .4byte gGroundEffects
thumb_func_end sub_80AD0C8
thumb_func_start sub_80AD10C
@ -773,7 +773,7 @@ _080AD14A:
pop {r0}
bx r0
.align 2, 0
_080AD150: .4byte gUnknown_3001B8C
_080AD150: .4byte gGroundEffects
_080AD154: .4byte 0x337fffff
thumb_func_end sub_80AD10C
@ -799,7 +799,7 @@ sub_80AD158:
movs r0, 0
b _080AD188
.align 2, 0
_080AD180: .4byte gUnknown_3001B8C
_080AD180: .4byte gGroundEffects
_080AD184:
adds r0, r2, 0
adds r0, 0x38
@ -833,13 +833,13 @@ sub_80AD18C:
movs r0, 0
b _080AD1CC
.align 2, 0
_080AD1B8: .4byte gUnknown_3001B8C
_080AD1B8: .4byte gGroundEffects
_080AD1BC:
adds r0, r2, 0
adds r0, 0x38
adds r1, r4, 0
adds r2, r3, 0
bl sub_809D6E4
bl GetPredefinedScript
lsls r0, 24
lsrs r0, 24
_080AD1CC:
@ -877,7 +877,7 @@ GroundEffect_ExecuteScript:
movs r0, 0
b _080AD22C
.align 2, 0
_080AD20C: .4byte gUnknown_3001B8C
_080AD20C: .4byte gGroundEffects
_080AD210: .4byte gUnknown_81186F4
_080AD214:
adds r0, r4, 0
@ -899,8 +899,8 @@ _080AD22C:
_080AD234: .4byte gUnknown_811872C
thumb_func_end GroundEffect_ExecuteScript
thumb_func_start sub_80AD238
sub_80AD238:
thumb_func_start GroundEffectsNotifyAll
GroundEffectsNotifyAll:
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -922,7 +922,7 @@ _080AD252:
adds r0, r4, 0
adds r0, 0x38
adds r1, r7, 0
bl sub_809D968
bl GroundScriptNotify
orrs r5, r0
lsls r0, r5, 24
lsrs r5, r0, 24
@ -944,11 +944,11 @@ _080AD26A:
pop {r1}
bx r1
.align 2, 0
_080AD28C: .4byte gUnknown_3001B8C
thumb_func_end sub_80AD238
_080AD28C: .4byte gGroundEffects
thumb_func_end GroundEffectsNotifyAll
thumb_func_start sub_80AD290
sub_80AD290:
thumb_func_start GroundEffectsCancelAll
GroundEffectsCancelAll:
push {r4-r7,lr}
ldr r0, _080AD2D4
ldr r4, [r0]
@ -984,8 +984,8 @@ _080AD2B6:
pop {r1}
bx r1
.align 2, 0
_080AD2D4: .4byte gUnknown_3001B8C
thumb_func_end sub_80AD290
_080AD2D4: .4byte gGroundEffects
thumb_func_end GroundEffectsCancelAll
thumb_func_start sub_80AD2D8
sub_80AD2D8:
@ -1003,7 +1003,7 @@ sub_80AD2D8:
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_080AD2F4: .4byte gUnknown_3001B8C
_080AD2F4: .4byte gGroundEffects
thumb_func_end sub_80AD2D8
thumb_func_start sub_80AD2F8
@ -1027,7 +1027,7 @@ sub_80AD2F8:
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_080AD31C: .4byte gUnknown_3001B8C
_080AD31C: .4byte gGroundEffects
thumb_func_end sub_80AD2F8
thumb_func_start sub_80AD320
@ -1055,7 +1055,7 @@ sub_80AD320:
str r0, [r3, 0x4]
b _080AD358
.align 2, 0
_080AD34C: .4byte gUnknown_3001B8C
_080AD34C: .4byte gGroundEffects
_080AD350:
ldr r0, [r2, 0xC]
ldr r1, [r2, 0x10]
@ -1092,7 +1092,7 @@ sub_80AD360:
str r0, [r3]
b _080AD3AA
.align 2, 0
_080AD38C: .4byte gUnknown_3001B8C
_080AD38C: .4byte gGroundEffects
_080AD390:
movs r1, 0x92
lsls r1, 1
@ -1136,7 +1136,7 @@ sub_80AD3B4:
pop {r1}
bx r1
.align 2, 0
_080AD3DC: .4byte gUnknown_3001B8C
_080AD3DC: .4byte gGroundEffects
thumb_func_end sub_80AD3B4
thumb_func_start sub_80AD3E0
@ -1261,24 +1261,24 @@ _080AD49C:
bx r1
thumb_func_end sub_80AD430
thumb_func_start sub_80AD4B8
sub_80AD4B8:
thumb_func_start CallbackEffectGetIndex
CallbackEffectGetIndex:
movs r1, 0x4
ldrsh r0, [r0, r1]
bx lr
thumb_func_end sub_80AD4B8
thumb_func_end CallbackEffectGetIndex
thumb_func_start sub_80AD4C0
sub_80AD4C0:
thumb_func_start CallbackEffectGetSize
CallbackEffectGetSize:
ldr r2, [r0, 0xC]
ldr r3, [r0, 0x10]
str r2, [r1]
str r3, [r1, 0x4]
bx lr
thumb_func_end sub_80AD4C0
thumb_func_end CallbackEffectGetSize
thumb_func_start sub_80AD4CC
sub_80AD4CC:
thumb_func_start CallbackEffectSetHitboxPos
CallbackEffectSetHitboxPos:
push {r4,lr}
adds r3, r0, 0
adds r4, r1, 0
@ -1368,10 +1368,10 @@ _080AD572:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AD4CC
thumb_func_end CallbackEffectSetHitboxPos
thumb_func_start sub_80AD578
sub_80AD578:
thumb_func_start CallbackEffectSetPositionBounds
CallbackEffectSetPositionBounds:
push {r4,lr}
ldr r3, [r1]
ldr r4, [r1, 0x4]
@ -1384,10 +1384,10 @@ sub_80AD578:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AD578
thumb_func_end CallbackEffectSetPositionBounds
thumb_func_start sub_80AD590
sub_80AD590:
thumb_func_start CallbackEffectGetHitboxCenter
CallbackEffectGetHitboxCenter:
adds r3, r0, 0
movs r2, 0x92
lsls r2, 1
@ -1404,18 +1404,18 @@ sub_80AD590:
adds r0, r2
str r0, [r1, 0x4]
bx lr
thumb_func_end sub_80AD590
thumb_func_end CallbackEffectGetHitboxCenter
thumb_func_start sub_80AD5B0
sub_80AD5B0:
thumb_func_start CallbackEffectMoveReal
CallbackEffectMoveReal:
push {lr}
bl sub_80AD3E0
pop {r1}
bx r1
thumb_func_end sub_80AD5B0
thumb_func_end CallbackEffectMoveReal
thumb_func_start sub_80AD5BC
sub_80AD5BC:
thumb_func_start CallbackEffectGetPosHeightAndUnk
CallbackEffectGetPosHeightAndUnk:
push {r4,lr}
adds r3, r0, 0
movs r4, 0x9A
@ -1431,29 +1431,29 @@ sub_80AD5BC:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AD5BC
thumb_func_end CallbackEffectGetPosHeightAndUnk
thumb_func_start sub_80AD5DC
sub_80AD5DC:
thumb_func_start CallbackEffectSetPosHeight
CallbackEffectSetPosHeight:
movs r2, 0x9A
lsls r2, 1
adds r0, r2
str r1, [r0]
bx lr
thumb_func_end sub_80AD5DC
thumb_func_end CallbackEffectSetPosHeight
thumb_func_start sub_80AD5E8
sub_80AD5E8:
thumb_func_start CallbackEffectGetDirection
CallbackEffectGetDirection:
movs r2, 0x90
lsls r2, 1
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
bx lr
thumb_func_end sub_80AD5E8
thumb_func_end CallbackEffectGetDirection
thumb_func_start sub_80AD5F4
sub_80AD5F4:
thumb_func_start CallbackEffectSetDirection
CallbackEffectSetDirection:
push {lr}
adds r2, r0, 0
lsls r1, 24
@ -1469,10 +1469,10 @@ sub_80AD5F4:
_080AD60C:
pop {r0}
bx r0
thumb_func_end sub_80AD5F4
thumb_func_end CallbackEffectSetDirection
thumb_func_start sub_80AD610
sub_80AD610:
thumb_func_start CallbackEffectSetEventIndex
CallbackEffectSetEventIndex:
push {r4,r5,lr}
lsls r1, 16
adds r3, r0, 0
@ -1524,10 +1524,10 @@ _080AD668:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80AD610
thumb_func_end CallbackEffectSetEventIndex
thumb_func_start sub_80AD670
sub_80AD670:
thumb_func_start CallbackEffectSetUnk_80AD670
CallbackEffectSetUnk_80AD670:
push {lr}
lsls r1, 16
asrs r1, 16
@ -1544,10 +1544,10 @@ _080AD682:
strh r2, [r0]
pop {r0}
bx r0
thumb_func_end sub_80AD670
thumb_func_end CallbackEffectSetUnk_80AD670
thumb_func_start sub_80AD690
sub_80AD690:
thumb_func_start CallbackEffectSpriteRelatedCheck_80AD690
CallbackEffectSpriteRelatedCheck_80AD690:
push {lr}
adds r1, r0, 0
movs r2, 0x9E
@ -1567,10 +1567,10 @@ _080AD6AE:
_080AD6B0:
pop {r1}
bx r1
thumb_func_end sub_80AD690
thumb_func_end CallbackEffectSpriteRelatedCheck_80AD690
thumb_func_start sub_80AD6B4
sub_80AD6B4:
thumb_func_start CallbackEffectSpriteRelated_80AD6B4
CallbackEffectSpriteRelated_80AD6B4:
push {lr}
adds r1, r0, 0
movs r2, 0xA0
@ -1592,45 +1592,45 @@ _080AD6D6:
_080AD6D8:
pop {r1}
bx r1
thumb_func_end sub_80AD6B4
thumb_func_end CallbackEffectSpriteRelated_80AD6B4
thumb_func_start sub_80AD6DC
sub_80AD6DC:
thumb_func_start CallbackEffectGetFlags
CallbackEffectGetFlags:
movs r2, 0x8E
lsls r2, 1
adds r0, r2
ldr r0, [r0]
str r0, [r1]
bx lr
thumb_func_end sub_80AD6DC
thumb_func_end CallbackEffectGetFlags
thumb_func_start sub_80AD6E8
sub_80AD6E8:
thumb_func_start CallbackEffectSetFlags
CallbackEffectSetFlags:
push {lr}
movs r2, 0x4
ldrsh r0, [r0, r2]
bl sub_80AD0C8
pop {r0}
bx r0
thumb_func_end sub_80AD6E8
thumb_func_end CallbackEffectSetFlags
thumb_func_start sub_80AD6F8
sub_80AD6F8:
thumb_func_start CallbackEffectClearFlags
CallbackEffectClearFlags:
push {lr}
movs r2, 0x4
ldrsh r0, [r0, r2]
bl sub_80AD10C
pop {r0}
bx r0
thumb_func_end sub_80AD6F8
thumb_func_end CallbackEffectClearFlags
thumb_func_start sub_80AD708
sub_80AD708:
thumb_func_start CallbackEffectMoveRelative
CallbackEffectMoveRelative:
push {lr}
bl sub_80AD430
pop {r1}
bx r1
thumb_func_end sub_80AD708
thumb_func_end CallbackEffectMoveRelative
thumb_func_start GroundEffect_Action
GroundEffect_Action:
@ -1666,14 +1666,14 @@ _080AD72C:
bl GroundEffect_Delete
b _080AD78A
.align 2, 0
_080AD754: .4byte gUnknown_3001B8C
_080AD754: .4byte gGroundEffects
_080AD758: .4byte gUnknown_811874C
_080AD75C:
adds r0, r4, 0
movs r1, 0
movs r2, 0x1
ldr r3, _080AD7A8
bl sub_809D8C0
bl ExecutePredefinedScript
_080AD768:
ldrb r0, [r6]
cmp r0, 0
@ -1804,7 +1804,7 @@ _080AD83C:
pop {r0}
bx r0
.align 2, 0
_080AD864: .4byte gUnknown_3001B8C
_080AD864: .4byte gGroundEffects
thumb_func_end sub_80AD7AC
.align 2,0

50
asm/ground_event.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80AD990
sub_80AD990:
thumb_func_start AllocGroundEvents
AllocGroundEvents:
push {r4,lr}
ldr r4, _080AD9C8
movs r0, 0x80
@ -30,17 +30,17 @@ _080AD9AC:
adds r1, 0x20
cmp r0, 0x1F
ble _080AD9AC
bl DeleteBlankGroundEvents
bl DeleteGroundEvents
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080AD9C8: .4byte gUnknown_3001B90
_080AD9C8: .4byte gGroundEvents
_080AD9CC: .4byte 0x0000ffff
thumb_func_end sub_80AD990
thumb_func_end AllocGroundEvents
thumb_func_start DeleteBlankGroundEvents
DeleteBlankGroundEvents:
thumb_func_start DeleteGroundEvents
DeleteGroundEvents:
push {r4-r6,lr}
ldr r0, _080ADA04
ldr r4, [r0]
@ -69,13 +69,13 @@ _080AD9EE:
pop {r0}
bx r0
.align 2, 0
_080ADA04: .4byte gUnknown_3001B90
thumb_func_end DeleteBlankGroundEvents
_080ADA04: .4byte gGroundEvents
thumb_func_end DeleteGroundEvents
thumb_func_start sub_80ADA08
sub_80ADA08:
thumb_func_start FreeGroundEvents
FreeGroundEvents:
push {r4,lr}
bl DeleteBlankGroundEvents
bl DeleteGroundEvents
ldr r4, _080ADA20
ldr r0, [r4]
bl MemoryFree
@ -85,8 +85,8 @@ sub_80ADA08:
pop {r0}
bx r0
.align 2, 0
_080ADA20: .4byte gUnknown_3001B90
thumb_func_end sub_80ADA08
_080ADA20: .4byte gGroundEvents
thumb_func_end FreeGroundEvents
thumb_func_start GroundEvent_Select
GroundEvent_Select:
@ -101,7 +101,7 @@ GroundEvent_Select:
asrs r6, r2, 24
ldr r1, _080ADA88
adds r0, r4, 0
bl sub_80A77D0
bl GetGroundScript
adds r5, r0, 0
ldr r1, _080ADA8C
str r6, [sp]
@ -199,7 +199,7 @@ _080ADADC:
bx r0
.align 2, 0
_080ADAF8: .4byte gGroundEventCancelText
_080ADAFC: .4byte gUnknown_3001B90
_080ADAFC: .4byte gGroundEvents
thumb_func_end GroundEvent_Cancel
thumb_func_start GroundEvent_Add
@ -232,7 +232,7 @@ GroundEvent_Add:
movs r7, 0
b _080ADB68
.align 2, 0
_080ADB38: .4byte gUnknown_3001B90
_080ADB38: .4byte gGroundEvents
_080ADB3C:
adds r0, r2, 0x1
lsls r0, 16
@ -287,7 +287,7 @@ _080ADB68:
movs r0, 0x60
b _080ADBAA
.align 2, 0
_080ADBA0: .4byte gUnknown_3001B90
_080ADBA0: .4byte gGroundEvents
_080ADBA4: .4byte gGroundEventAddText
_080ADBA8:
movs r0, 0x20
@ -383,7 +383,7 @@ GroundEvent_Delete:
pop {r0}
bx r0
.align 2, 0
_080ADC58: .4byte gUnknown_3001B90
_080ADC58: .4byte gGroundEvents
_080ADC5C: .4byte gGroundEventDeleteText
_080ADC60: .4byte 0x0000ffff
thumb_func_end GroundEvent_Delete
@ -406,7 +406,7 @@ sub_80ADC64:
movs r0, 0
b _080ADC9A
.align 2, 0
_080ADC84: .4byte gUnknown_3001B90
_080ADC84: .4byte gGroundEvents
_080ADC88:
ldr r0, [r2, 0x1C]
str r0, [r3]
@ -422,8 +422,8 @@ _080ADC9A:
bx r1
thumb_func_end sub_80ADC64
thumb_func_start sub_80ADCA0
sub_80ADCA0:
thumb_func_start FindGroundEvent
FindGroundEvent:
push {r4-r7,lr}
adds r7, r0, 0
adds r4, r1, 0
@ -463,7 +463,7 @@ _080ADCB6:
adds r0, r5, 0
b _080ADD04
.align 2, 0
_080ADCEC: .4byte gUnknown_3001B90
_080ADCEC: .4byte gGroundEvents
_080ADCF0:
adds r0, r6, 0
movs r1, 0x80
@ -479,7 +479,7 @@ _080ADD04:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80ADCA0
thumb_func_end FindGroundEvent
thumb_func_start sub_80ADD0C
sub_80ADD0C:
@ -536,7 +536,7 @@ _080ADD2C:
adds r0, r7, 0
b _080ADD8C
.align 2, 0
_080ADD74: .4byte gUnknown_3001B90
_080ADD74: .4byte gGroundEvents
_080ADD78:
mov r0, r12
movs r1, 0x80

16
asm/ground_link.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80AD8B4
sub_80AD8B4:
thumb_func_start GroundLink_GetPos
GroundLink_GetPos:
push {r4,lr}
adds r4, r1, 0
lsls r0, 16
@ -55,11 +55,11 @@ _080AD906:
pop {r1}
bx r1
.align 2, 0
_080AD910: .4byte gUnknown_203B4B8
thumb_func_end sub_80AD8B4
_080AD910: .4byte gCurrentGroundLink
thumb_func_end GroundLink_GetPos
thumb_func_start sub_80AD914
sub_80AD914:
thumb_func_start GroundLink_GetArea
GroundLink_GetArea:
push {r4,r5,lr}
adds r4, r1, 0
adds r5, r2, 0
@ -123,7 +123,7 @@ _080AD970:
pop {r1}
bx r1
.align 2, 0
_080AD98C: .4byte gUnknown_203B4B8
thumb_func_end sub_80AD914
_080AD98C: .4byte gCurrentGroundLink
thumb_func_end GroundLink_GetArea
.align 2,0

406
asm/ground_lives.s
View File

File diff suppressed because it is too large Load Diff

4
asm/ground_map.s
View File

@ -23,10 +23,10 @@ GroundMap_GetStationScript:
lsls r5, 24
asrs r5, 24
adds r0, r4, 0
bl sub_80A77A0
bl ChangeScriptFile
ldr r1, _080A4BE0
adds r0, r4, 0
bl sub_80A77D0
bl GetGroundScript
mov r9, r0
ldr r1, _080A4BE4
str r5, [sp]

84
asm/ground_map_1.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80A4D7C
sub_80A4D7C:
thumb_func_start GetAdjustedGroundMap
GetAdjustedGroundMap:
push {r4,r5,lr}
lsls r0, 16
asrs r5, r0, 16
@ -23,11 +23,11 @@ _080A4D90:
_080A4D94:
movs r0, 0
movs r1, 0x27
bl sub_8001658
bl GetScriptVarValue
adds r4, r0, 0
movs r0, 0
movs r1, 0x28
bl sub_8001658
bl GetScriptVarValue
lsls r1, r4, 1
adds r1, r4
lsls r1, 1
@ -48,7 +48,7 @@ _080A4DC4:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80A4D7C
thumb_func_end GetAdjustedGroundMap
thumb_func_start GroundMap_Select
GroundMap_Select:
@ -61,10 +61,10 @@ GroundMap_Select:
bl Log
movs r0, 0
movs r1, 0x37
bl sub_80015C0
bl ClearScriptVarArray
movs r0, 0
movs r1, 0x38
bl sub_80015C0
bl ClearScriptVarArray
movs r0, 0
bl sub_80A5EDC
ldr r4, _080A4E3C
@ -99,7 +99,7 @@ _080A4E08:
b _080A50BA
.align 2, 0
_080A4E38: .4byte gUnknown_81176A4
_080A4E3C: .4byte gUnknown_3001B70
_080A4E3C: .4byte gGroundMapDungeon_3001B70
_080A4E40: .4byte 0x0000055c
_080A4E44: .4byte gGroundMapAction
_080A4E48: .4byte gUnknown_8117324
@ -150,7 +150,7 @@ _080A4EA8:
strh r0, [r1]
b _080A4F30
.align 2, 0
_080A4EC0: .4byte gUnknown_3001B70
_080A4EC0: .4byte gGroundMapDungeon_3001B70
_080A4EC4: .4byte gUnknown_811733C
_080A4EC8: .4byte gUnknown_2026E4E
_080A4ECC:
@ -163,7 +163,7 @@ _080A4ECC:
b _080A4EEA
.align 2, 0
_080A4EDC: .4byte gUnknown_81173C0
_080A4EE0: .4byte gUnknown_3001B70
_080A4EE0: .4byte gGroundMapDungeon_3001B70
_080A4EE4:
adds r4, 0xC
movs r2, 0
@ -256,7 +256,7 @@ _080A4F30:
beq _080A5084
b _080A50A2
.align 2, 0
_080A4FA0: .4byte gUnknown_3001B70
_080A4FA0: .4byte gGroundMapDungeon_3001B70
_080A4FA4: .4byte gUnknown_8117324
_080A4FA8: .4byte gGroundMapAction
_080A4FAC:
@ -306,7 +306,7 @@ _080A4FEE:
ldr r2, _080A5008
b _080A5050
.align 2, 0
_080A5000: .4byte gUnknown_3001B70
_080A5000: .4byte gGroundMapDungeon_3001B70
_080A5004: .4byte gUnknown_2026E4E
_080A5008: .4byte 0x00000808
_080A500C:
@ -314,7 +314,7 @@ _080A500C:
ldr r0, [r0]
b _080A5062
.align 2, 0
_080A5014: .4byte gUnknown_3001B70
_080A5014: .4byte gGroundMapDungeon_3001B70
_080A5018:
ldr r0, [r5]
movs r1, 0x1
@ -327,7 +327,7 @@ _080A5020:
bl sub_80A3B80
b _080A50A2
.align 2, 0
_080A5030: .4byte gUnknown_3001B70
_080A5030: .4byte gGroundMapDungeon_3001B70
_080A5034:
ldr r1, _080A503C
ldr r2, _080A5040
@ -399,7 +399,7 @@ _080A50BA:
pop {r0}
bx r0
.align 2, 0
_080A50C0: .4byte gUnknown_3001B70
_080A50C0: .4byte gGroundMapDungeon_3001B70
_080A50C4: .4byte gUnknown_81176F8
thumb_func_end GroundMap_Select
@ -420,10 +420,10 @@ GroundMap_SelectDungeon:
bl Log
movs r0, 0
movs r1, 0x37
bl sub_80015C0
bl ClearScriptVarArray
movs r0, 0
movs r1, 0x38
bl sub_80015C0
bl ClearScriptVarArray
movs r0, 0
bl sub_80A5EDC
ldr r7, _080A5150
@ -465,7 +465,7 @@ _080A5138:
b _080A51EC
.align 2, 0
_080A514C: .4byte gUnknown_8117700
_080A5150: .4byte gUnknown_3001B70
_080A5150: .4byte gGroundMapDungeon_3001B70
_080A5154: .4byte 0x0000055c
_080A5158: .4byte gGroundMapAction
_080A515C: .4byte gUnknown_8117324
@ -1230,7 +1230,7 @@ sub_80A56A0:
pop {r0}
bx r0
.align 2, 0
_080A56BC: .4byte gUnknown_3001B70
_080A56BC: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A56A0
thumb_func_start sub_80A56C0
@ -1244,7 +1244,7 @@ sub_80A56C0:
pop {r0}
bx r0
.align 2, 0
_080A56D4: .4byte gUnknown_3001B70
_080A56D4: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A56C0
thumb_func_start sub_80A56D8
@ -1258,7 +1258,7 @@ sub_80A56D8:
pop {r0}
bx r0
.align 2, 0
_080A56EC: .4byte gUnknown_3001B70
_080A56EC: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A56D8
thumb_func_start sub_80A56F0
@ -1337,7 +1337,7 @@ sub_80A5758:
movs r0, 0
b _080A5772
.align 2, 0
_080A5768: .4byte gUnknown_3001B70
_080A5768: .4byte gGroundMapDungeon_3001B70
_080A576C:
bl sub_80A4608
movs r0, 0x1
@ -1346,8 +1346,8 @@ _080A5772:
bx r1
thumb_func_end sub_80A5758
thumb_func_start sub_80A5778
sub_80A5778:
thumb_func_start GetCurrentDungeonBounds
GetCurrentDungeonBounds:
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@ -1358,15 +1358,15 @@ sub_80A5778:
movs r0, 0
b _080A5798
.align 2, 0
_080A578C: .4byte gUnknown_3001B70
_080A578C: .4byte gGroundMapDungeon_3001B70
_080A5790:
adds r1, r3, 0
bl sub_80A463C
bl GetDungeonBounds
movs r0, 0x1
_080A5798:
pop {r1}
bx r1
thumb_func_end sub_80A5778
thumb_func_end GetCurrentDungeonBounds
thumb_func_start sub_80A579C
sub_80A579C:
@ -1396,7 +1396,7 @@ sub_80A579C:
adds r0, r3, 0
adds r1, r6, 0
adds r2, r5, 0
bl sub_80A463C
bl GetDungeonBounds
ldr r2, [r6]
mov r12, r2
movs r0, 0xF0
@ -1450,7 +1450,7 @@ _080A5832:
movs r0, 0x1
b _080A5856
.align 2, 0
_080A5838: .4byte gUnknown_3001B70
_080A5838: .4byte gGroundMapDungeon_3001B70
_080A583C: .4byte gGroundMapAction
_080A5840: .4byte gGroundConversion_811BAF4
_080A5844: .4byte 0xffff8800
@ -1465,8 +1465,8 @@ _080A5856:
bx r1
thumb_func_end sub_80A579C
thumb_func_start sub_80A585C
sub_80A585C:
thumb_func_start CheckMapCollision_80A585C
CheckMapCollision_80A585C:
push {r4-r7,lr}
adds r7, r1, 0
ldr r1, _080A5884
@ -1488,7 +1488,7 @@ _080A587E:
movs r0, 0x1
b _080A58C0
.align 2, 0
_080A5884: .4byte gUnknown_3001B70
_080A5884: .4byte gGroundMapDungeon_3001B70
_080A5888: .4byte 0x00000544
_080A588C: .4byte 0x00000405
_080A5890:
@ -1524,7 +1524,7 @@ _080A58C0:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80A585C
thumb_func_end CheckMapCollision_80A585C
thumb_func_start sub_80A58C8
sub_80A58C8:
@ -1549,7 +1549,7 @@ _080A58EA:
movs r0, 0x1
b _080A592C
.align 2, 0
_080A58F0: .4byte gUnknown_3001B70
_080A58F0: .4byte gGroundMapDungeon_3001B70
_080A58F4: .4byte 0x00000544
_080A58F8: .4byte 0x00000405
_080A58FC:
@ -1606,7 +1606,7 @@ sub_80A5934:
pop {r1}
bx r1
.align 2, 0
_080A5958: .4byte gUnknown_3001B70
_080A5958: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A5934
thumb_func_start sub_80A595C
@ -1628,7 +1628,7 @@ sub_80A595C:
pop {r1}
bx r1
.align 2, 0
_080A5980: .4byte gUnknown_3001B70
_080A5980: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A595C
thumb_func_start sub_80A5984
@ -1645,7 +1645,7 @@ sub_80A5984:
pop {r1}
bx r1
.align 2, 0
_080A599C: .4byte gUnknown_3001B70
_080A599C: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A5984
thumb_func_start sub_80A59A0
@ -1664,7 +1664,7 @@ sub_80A59A0:
pop {r0}
bx r0
.align 2, 0
_080A59BC: .4byte gUnknown_3001B70
_080A59BC: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A59A0
thumb_func_start GroundMap_Action
@ -1733,7 +1733,7 @@ _080A5A2C:
_080A5A32:
b _080A5E46
.align 2, 0
_080A5A34: .4byte gUnknown_3001B70
_080A5A34: .4byte gGroundMapDungeon_3001B70
_080A5A38: .4byte gGroundMapAction
_080A5A3C:
cmp r0, 0xA8
@ -1832,7 +1832,7 @@ _080A5A8C:
ldr r0, [r5]
b _080A5DD0
.align 2, 0
_080A5AF0: .4byte gUnknown_3001B70
_080A5AF0: .4byte gGroundMapDungeon_3001B70
_080A5AF4:
ldr r2, [r6]
adds r3, r2, 0
@ -1883,7 +1883,7 @@ _080A5B20:
movs r1, 0
b _080A5DD2
.align 2, 0
_080A5B54: .4byte gUnknown_3001B70
_080A5B54: .4byte gGroundMapDungeon_3001B70
_080A5B58:
adds r4, r3, 0
adds r4, 0xF0
@ -2286,7 +2286,7 @@ _080A5E5A:
pop {r0}
bx r0
.align 2, 0
_080A5E6C: .4byte gUnknown_3001B70
_080A5E6C: .4byte gGroundMapDungeon_3001B70
thumb_func_end sub_80A59DC
.align 2,0

252
asm/ground_object.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80ABB54
sub_80ABB54:
thumb_func_start AllocGroundObjects
AllocGroundObjects:
push {r4,r5,lr}
ldr r4, _080ABB90
movs r0, 0xE2
@ -32,17 +32,17 @@ _080ABB74:
adds r1, r4
cmp r0, 0xF
ble _080ABB74
bl DeleteBlankGroundObjects
bl DeleteGroundObjects
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080ABB90: .4byte gUnknown_3001B88
_080ABB90: .4byte gGroundObjects
_080ABB94: .4byte 0x0000ffff
thumb_func_end sub_80ABB54
thumb_func_end AllocGroundObjects
thumb_func_start DeleteBlankGroundObjects
DeleteBlankGroundObjects:
thumb_func_start DeleteGroundObjects
DeleteGroundObjects:
push {r4-r6,lr}
ldr r0, _080ABBD0
ldr r4, [r0]
@ -73,13 +73,13 @@ _080ABBB6:
pop {r0}
bx r0
.align 2, 0
_080ABBD0: .4byte gUnknown_3001B88
thumb_func_end DeleteBlankGroundObjects
_080ABBD0: .4byte gGroundObjects
thumb_func_end DeleteGroundObjects
thumb_func_start sub_80ABBD4
sub_80ABBD4:
thumb_func_start FreeGroundObjects
FreeGroundObjects:
push {r4,lr}
bl DeleteBlankGroundObjects
bl DeleteGroundObjects
ldr r4, _080ABBEC
ldr r0, [r4]
bl MemoryFree
@ -89,8 +89,8 @@ sub_80ABBD4:
pop {r0}
bx r0
.align 2, 0
_080ABBEC: .4byte gUnknown_3001B88
thumb_func_end sub_80ABBD4
_080ABBEC: .4byte gGroundObjects
thumb_func_end FreeGroundObjects
thumb_func_start GroundObject_Select
GroundObject_Select:
@ -105,7 +105,7 @@ GroundObject_Select:
asrs r6, r2, 24
ldr r1, _080ABC54
adds r0, r4, 0
bl sub_80A77D0
bl GetGroundScript
adds r5, r0, 0
ldr r1, _080ABC58
str r6, [sp]
@ -204,7 +204,7 @@ _080ABCA6:
bx r0
.align 2, 0
_080ABCC4: .4byte gUnknown_8118414
_080ABCC8: .4byte gUnknown_3001B88
_080ABCC8: .4byte gGroundObjects
thumb_func_end GroundObject_Cancel
thumb_func_start GroundObject_CancelBlank
@ -243,7 +243,7 @@ _080ABCF0:
lsls r1, 1
adds r0, r4, r1
mov r1, sp
bl sub_80A675C
bl IsOnscreen_80A675C
lsls r0, 24
cmp r0, 0
bne _080ABD20
@ -267,7 +267,7 @@ _080ABD20:
bx r0
.align 2, 0
_080ABD40: .4byte gUnknown_811842C
_080ABD44: .4byte gUnknown_3001B88
_080ABD44: .4byte gGroundObjects
thumb_func_end GroundObject_CancelBlank
thumb_func_start sub_80ABD48
@ -291,7 +291,7 @@ _080ABD5E:
adds r0, r3, 0
b _080ABD80
.align 2, 0
_080ABD6C: .4byte gUnknown_3001B88
_080ABD6C: .4byte gGroundObjects
_080ABD70:
adds r0, r2, 0
adds r2, r5
@ -329,7 +329,7 @@ GroundObject_Add:
bne _080ABDDA
movs r0, 0
movs r1, 0x28
bl sub_8001658
bl GetScriptVarValue
cmp r0, 0x1
bgt _080ABDBC
movs r4, 0x1B
@ -337,12 +337,12 @@ GroundObject_Add:
_080ABDBC:
movs r0, 0
movs r1, 0x29
bl sub_8001658
bl GetScriptVarValue
cmp r0, 0
bne _080ABDD4
movs r0, 0
movs r1, 0x27
bl sub_8001658
bl GetScriptVarValue
adds r0, 0x1C
b _080ABDD6
_080ABDD4:
@ -378,8 +378,8 @@ _080ABDF4:
movs r7, 0
b _080ABE40
.align 2, 0
_080ABE10: .4byte gUnknown_811ED20
_080ABE14: .4byte gUnknown_3001B88
_080ABE10: .4byte gGroundObjectTypes
_080ABE14: .4byte gGroundObjects
_080ABE18:
adds r0, r3, 0x1
lsls r0, 16
@ -456,7 +456,7 @@ _080ABE9C:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080ABEA8: .4byte gUnknown_3001B88
_080ABEA8: .4byte gGroundObjects
_080ABEAC: .4byte gUnknown_8118448
_080ABEB0: .4byte _080ABEB4
.align 2, 0
@ -693,7 +693,7 @@ _080AC076:
adds r0, 0x28
adds r1, r5, 0
adds r1, 0x30
bl sub_80A5778
bl GetCurrentDungeonBounds
ldr r3, [sp, 0x10]
cmp r3, 0
beq _080AC0C0
@ -742,7 +742,7 @@ _080AC0C0:
movs r2, 0xA2
lsls r2, 1
adds r0, r5, r2
bl sub_80A66A4
bl SpriteHasPokemonSize_80A66A4
lsls r0, 24
ldr r2, _080AC158
cmp r0, 0
@ -784,7 +784,7 @@ _080AC11C:
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl sub_809D8C0
bl ExecutePredefinedScript
_080AC140:
adds r0, r7, 0
_080AC142:
@ -797,7 +797,7 @@ _080AC142:
pop {r1}
bx r1
.align 2, 0
_080AC154: .4byte gUnknown_81182A0
_080AC154: .4byte gGroundObjectCallbacks
_080AC158: .4byte gUnknown_81182F4
_080AC15C: .4byte gUnknown_8118350
_080AC160: .4byte gFunctionScriptTable
@ -827,14 +827,14 @@ GroundObject_Delete:
bl sub_80A7658
adds r0, r4, 0
adds r0, 0x38
bl sub_809D648
bl InitAction2
ldr r0, _080AC1AC
strh r0, [r4, 0x6]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080AC1A4: .4byte gUnknown_3001B88
_080AC1A4: .4byte gGroundObjects
_080AC1A8: .4byte gUnknown_81184B0
_080AC1AC: .4byte 0x0000ffff
thumb_func_end GroundObject_Delete
@ -873,7 +873,7 @@ _080AC1EA:
pop {r0}
bx r0
.align 2, 0
_080AC1F0: .4byte gUnknown_3001B88
_080AC1F0: .4byte gGroundObjects
thumb_func_end sub_80AC1B0
thumb_func_start sub_80AC1F4
@ -913,7 +913,7 @@ _080AC232:
pop {r0}
bx r0
.align 2, 0
_080AC238: .4byte gUnknown_3001B88
_080AC238: .4byte gGroundObjects
_080AC23C: .4byte 0x337fffff
thumb_func_end sub_80AC1F4
@ -939,7 +939,7 @@ sub_80AC240:
movs r0, 0
b _080AC270
.align 2, 0
_080AC268: .4byte gUnknown_3001B88
_080AC268: .4byte gGroundObjects
_080AC26C:
adds r0, r2, 0
adds r0, 0x38
@ -973,13 +973,13 @@ sub_80AC274:
movs r0, 0
b _080AC2B4
.align 2, 0
_080AC2A0: .4byte gUnknown_3001B88
_080AC2A0: .4byte gGroundObjects
_080AC2A4:
adds r0, r2, 0
adds r0, 0x38
adds r1, r4, 0
adds r2, r3, 0
bl sub_809D6E4
bl GetPredefinedScript
lsls r0, 24
lsrs r0, 24
_080AC2B4:
@ -1017,7 +1017,7 @@ GroundObject_ExecuteScript:
movs r0, 0
b _080AC314
.align 2, 0
_080AC2F4: .4byte gUnknown_3001B88
_080AC2F4: .4byte gGroundObjects
_080AC2F8: .4byte gUnknown_81184CC
_080AC2FC:
adds r0, r4, 0
@ -1039,8 +1039,8 @@ _080AC314:
_080AC31C: .4byte gUnknown_8118504
thumb_func_end GroundObject_ExecuteScript
thumb_func_start sub_80AC320
sub_80AC320:
thumb_func_start GroundObjectsNotifyAll
GroundObjectsNotifyAll:
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -1062,7 +1062,7 @@ _080AC33A:
adds r0, r4, 0
adds r0, 0x38
adds r1, r7, 0
bl sub_809D968
bl GroundScriptNotify
orrs r5, r0
lsls r0, r5, 24
lsrs r5, r0, 24
@ -1084,11 +1084,11 @@ _080AC352:
pop {r1}
bx r1
.align 2, 0
_080AC374: .4byte gUnknown_3001B88
thumb_func_end sub_80AC320
_080AC374: .4byte gGroundObjects
thumb_func_end GroundObjectsNotifyAll
thumb_func_start sub_80AC378
sub_80AC378:
thumb_func_start GroundObjectsCancellAll
GroundObjectsCancellAll:
push {r4-r7,lr}
ldr r0, _080AC3BC
ldr r4, [r0]
@ -1124,8 +1124,8 @@ _080AC39E:
pop {r1}
bx r1
.align 2, 0
_080AC3BC: .4byte gUnknown_3001B88
thumb_func_end sub_80AC378
_080AC3BC: .4byte gGroundObjects
thumb_func_end GroundObjectsCancellAll
thumb_func_start sub_80AC3C0
sub_80AC3C0:
@ -1143,7 +1143,7 @@ sub_80AC3C0:
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_080AC3DC: .4byte gUnknown_3001B88
_080AC3DC: .4byte gGroundObjects
thumb_func_end sub_80AC3C0
thumb_func_start sub_80AC3E0
@ -1167,7 +1167,7 @@ sub_80AC3E0:
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_080AC404: .4byte gUnknown_3001B88
_080AC404: .4byte gGroundObjects
thumb_func_end sub_80AC3E0
thumb_func_start sub_80AC408
@ -1195,7 +1195,7 @@ sub_80AC408:
str r0, [r3, 0x4]
b _080AC440
.align 2, 0
_080AC434: .4byte gUnknown_3001B88
_080AC434: .4byte gGroundObjects
_080AC438:
ldr r0, [r2, 0xC]
ldr r1, [r2, 0x10]
@ -1232,7 +1232,7 @@ sub_80AC448:
str r0, [r3]
b _080AC492
.align 2, 0
_080AC474: .4byte gUnknown_3001B88
_080AC474: .4byte gGroundObjects
_080AC478:
movs r1, 0x92
lsls r1, 1
@ -1269,14 +1269,14 @@ sub_80AC49C:
ldr r4, [r3]
adds r4, r2
adds r0, r4, 0
bl sub_80AC6AC
bl TryMoveObjectRelative_80AC6AC
movs r1, 0x6
ldrsh r0, [r4, r1]
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080AC4C4: .4byte gUnknown_3001B88
_080AC4C4: .4byte gGroundObjects
thumb_func_end sub_80AC49C
thumb_func_start sub_80AC4C8
@ -1334,7 +1334,7 @@ _080AC4DE:
adds r0, r5, 0
b _080AC54C
.align 2, 0
_080AC530: .4byte gUnknown_3001B88
_080AC530: .4byte gGroundObjects
_080AC534:
adds r0, r6, 0
movs r1, 0x80
@ -1416,7 +1416,7 @@ _080AC576:
adds r0, r6, 0
b _080AC5E4
.align 2, 0
_080AC5C8: .4byte gUnknown_3001B88
_080AC5C8: .4byte gGroundObjects
_080AC5CC:
adds r0, r7, 0
movs r2, 0x80
@ -1440,8 +1440,8 @@ _080AC5E4:
bx r1
thumb_func_end sub_80AC554
thumb_func_start sub_80AC5F4
sub_80AC5F4:
thumb_func_start GetObjectCollision_80AC5F4
GetObjectCollision_80AC5F4:
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -1500,7 +1500,7 @@ _080AC63A:
beq _080AC678
mov r0, sp
adds r1, r2, 0
bl sub_80A585C
bl CheckMapCollision_80A585C
lsls r0, 24
cmp r0, 0
beq _080AC678
@ -1522,7 +1522,7 @@ _080AC678:
negs r0, r0
adds r2, r5, 0
adds r3, r6, 0
bl sub_80A92A0
bl GetLivesCollision_80A92A0
lsls r0, 16
cmp r0, 0
blt _080AC69E
@ -1537,10 +1537,10 @@ _080AC6A0:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80AC5F4
thumb_func_end GetObjectCollision_80AC5F4
thumb_func_start sub_80AC6AC
sub_80AC6AC:
thumb_func_start TryMoveObjectRelative_80AC6AC
TryMoveObjectRelative_80AC6AC:
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
@ -1578,7 +1578,7 @@ _080AC6EA:
_080AC6EE:
adds r0, r5, 0
mov r1, sp
bl sub_80AC5F4
bl GetObjectCollision_80AC5F4
cmp r0, 0
bne _080AC718
movs r0, 0x92
@ -1601,10 +1601,10 @@ _080AC718:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80AC6AC
thumb_func_end TryMoveObjectRelative_80AC6AC
thumb_func_start sub_80AC720
sub_80AC720:
thumb_func_start TryMoveRelative_80AC720
TryMoveRelative_80AC720:
push {r4,r5,lr}
sub sp, 0x10
adds r4, r0, 0
@ -1680,7 +1680,7 @@ _080AC7A4:
_080AC7A6:
adds r0, r4, 0
mov r1, sp
bl sub_80AC5F4
bl GetObjectCollision_80AC5F4
cmp r0, 0
bne _080AC7D8
movs r3, 0x92
@ -1708,26 +1708,26 @@ _080AC7D8:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80AC720
thumb_func_end TryMoveRelative_80AC720
thumb_func_start sub_80AC7E0
sub_80AC7E0:
thumb_func_start CallbackObjectGetIndex
CallbackObjectGetIndex:
movs r1, 0x4
ldrsh r0, [r0, r1]
bx lr
thumb_func_end sub_80AC7E0
thumb_func_end CallbackObjectGetIndex
thumb_func_start sub_80AC7E8
sub_80AC7E8:
thumb_func_start CallbackObjectGetSize
CallbackObjectGetSize:
ldr r2, [r0, 0xC]
ldr r3, [r0, 0x10]
str r2, [r1]
str r3, [r1, 0x4]
bx lr
thumb_func_end sub_80AC7E8
thumb_func_end CallbackObjectGetSize
thumb_func_start sub_80AC7F4
sub_80AC7F4:
thumb_func_start CallbackObjectSetHitboxPos
CallbackObjectSetHitboxPos:
push {r4,lr}
adds r3, r0, 0
adds r4, r1, 0
@ -1817,10 +1817,10 @@ _080AC89A:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AC7F4
thumb_func_end CallbackObjectSetHitboxPos
thumb_func_start sub_80AC8A0
sub_80AC8A0:
thumb_func_start CallbackObjectSetPositionBounds
CallbackObjectSetPositionBounds:
push {r4,lr}
ldr r3, [r1]
ldr r4, [r1, 0x4]
@ -1833,10 +1833,10 @@ sub_80AC8A0:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AC8A0
thumb_func_end CallbackObjectSetPositionBounds
thumb_func_start sub_80AC8B8
sub_80AC8B8:
thumb_func_start CallbackObjectGetHitboxCenter
CallbackObjectGetHitboxCenter:
adds r3, r0, 0
movs r2, 0x92
lsls r2, 1
@ -1853,18 +1853,18 @@ sub_80AC8B8:
adds r0, r2
str r0, [r1, 0x4]
bx lr
thumb_func_end sub_80AC8B8
thumb_func_end CallbackObjectGetHitboxCenter
thumb_func_start sub_80AC8D8
sub_80AC8D8:
thumb_func_start CallbackObjectMoveReal
CallbackObjectMoveReal:
push {lr}
bl sub_80AC6AC
bl TryMoveObjectRelative_80AC6AC
pop {r1}
bx r1
thumb_func_end sub_80AC8D8
thumb_func_end CallbackObjectMoveReal
thumb_func_start sub_80AC8E4
sub_80AC8E4:
thumb_func_start CallbackObjectGetPosHeightAndUnk
CallbackObjectGetPosHeightAndUnk:
push {r4,lr}
adds r3, r0, 0
movs r4, 0x9A
@ -1880,29 +1880,29 @@ sub_80AC8E4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80AC8E4
thumb_func_end CallbackObjectGetPosHeightAndUnk
thumb_func_start sub_80AC904
sub_80AC904:
thumb_func_start CallbackObjectSetPosHeight
CallbackObjectSetPosHeight:
movs r2, 0x9A
lsls r2, 1
adds r0, r2
str r1, [r0]
bx lr
thumb_func_end sub_80AC904
thumb_func_end CallbackObjectSetPosHeight
thumb_func_start sub_80AC910
sub_80AC910:
thumb_func_start CallbackObjectGetDirection
CallbackObjectGetDirection:
movs r2, 0x90
lsls r2, 1
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
bx lr
thumb_func_end sub_80AC910
thumb_func_end CallbackObjectGetDirection
thumb_func_start sub_80AC91C
sub_80AC91C:
thumb_func_start CallbackObjectSetDirection
CallbackObjectSetDirection:
push {lr}
adds r2, r0, 0
lsls r1, 24
@ -1918,10 +1918,10 @@ sub_80AC91C:
_080AC934:
pop {r0}
bx r0
thumb_func_end sub_80AC91C
thumb_func_end CallbackObjectSetDirection
thumb_func_start sub_80AC938
sub_80AC938:
thumb_func_start CallbackObjectSetEventIndex
CallbackObjectSetEventIndex:
push {r4,r5,lr}
lsls r1, 16
adds r3, r0, 0
@ -1973,10 +1973,10 @@ _080AC990:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80AC938
thumb_func_end CallbackObjectSetEventIndex
thumb_func_start sub_80AC998
sub_80AC998:
thumb_func_start CallbackObjectSetUnk_80AC998
CallbackObjectSetUnk_80AC998:
push {lr}
lsls r1, 16
asrs r1, 16
@ -1993,10 +1993,10 @@ _080AC9AA:
strh r2, [r0]
pop {r0}
bx r0
thumb_func_end sub_80AC998
thumb_func_end CallbackObjectSetUnk_80AC998
thumb_func_start sub_80AC9B8
sub_80AC9B8:
thumb_func_start CallbackObjectSpriteRelatedCheck_80AC9B8
CallbackObjectSpriteRelatedCheck_80AC9B8:
push {lr}
adds r1, r0, 0
movs r2, 0x9E
@ -2016,10 +2016,10 @@ _080AC9D6:
_080AC9D8:
pop {r1}
bx r1
thumb_func_end sub_80AC9B8
thumb_func_end CallbackObjectSpriteRelatedCheck_80AC9B8
thumb_func_start sub_80AC9DC
sub_80AC9DC:
thumb_func_start CallbackObjectSpriteRelated_80AC9DC
CallbackObjectSpriteRelated_80AC9DC:
push {lr}
adds r1, r0, 0
movs r2, 0xA0
@ -2041,45 +2041,45 @@ _080AC9FE:
_080ACA00:
pop {r1}
bx r1
thumb_func_end sub_80AC9DC
thumb_func_end CallbackObjectSpriteRelated_80AC9DC
thumb_func_start sub_80ACA04
sub_80ACA04:
thumb_func_start CallbackObjectGetFlags
CallbackObjectGetFlags:
movs r2, 0x8E
lsls r2, 1
adds r0, r2
ldr r0, [r0]
str r0, [r1]
bx lr
thumb_func_end sub_80ACA04
thumb_func_end CallbackObjectGetFlags
thumb_func_start sub_80ACA10
sub_80ACA10:
thumb_func_start CallbackObjectSetFlags
CallbackObjectSetFlags:
push {lr}
movs r2, 0x4
ldrsh r0, [r0, r2]
bl sub_80AC1B0
pop {r0}
bx r0
thumb_func_end sub_80ACA10
thumb_func_end CallbackObjectSetFlags
thumb_func_start sub_80ACA20
sub_80ACA20:
thumb_func_start CallbackObjectClearFlags
CallbackObjectClearFlags:
push {lr}
movs r2, 0x4
ldrsh r0, [r0, r2]
bl sub_80AC1F4
pop {r0}
bx r0
thumb_func_end sub_80ACA20
thumb_func_end CallbackObjectClearFlags
thumb_func_start sub_80ACA30
sub_80ACA30:
thumb_func_start CallbackObjectMoveRelative
CallbackObjectMoveRelative:
push {lr}
bl sub_80AC720
bl TryMoveRelative_80AC720
pop {r1}
bx r1
thumb_func_end sub_80ACA30
thumb_func_end CallbackObjectMoveRelative
thumb_func_start GroundObject_Action
GroundObject_Action:
@ -2115,14 +2115,14 @@ _080ACA54:
bl GroundObject_Delete
b _080ACAB2
.align 2, 0
_080ACA7C: .4byte gUnknown_3001B88
_080ACA7C: .4byte gGroundObjects
_080ACA80: .4byte gUnknown_8118524
_080ACA84:
adds r0, r4, 0
movs r1, 0
movs r2, 0x1
ldr r3, _080ACAD0
bl sub_809D8C0
bl ExecutePredefinedScript
_080ACA90:
ldrb r0, [r6]
cmp r0, 0
@ -2253,7 +2253,7 @@ _080ACB64:
pop {r0}
bx r0
.align 2, 0
_080ACB8C: .4byte gUnknown_3001B88
_080ACB8C: .4byte gGroundObjects
thumb_func_end sub_80ACAD4
.align 2,0

56
asm/ground_script.s
View File

@ -214,7 +214,7 @@ _080A172C: .4byte gFriendAreaDialogue
_080A1730:
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r0, 16
bl sub_80A2740
@ -271,7 +271,7 @@ _080A1794:
movs r0, 0
movs r1, 0x2F
adds r2, r4, 0
bl sub_8001784
bl GetScriptVarArrayValue
cmp r0, 0
bne _080A17B6
bl _080A234E
@ -1001,7 +1001,7 @@ _080A1DA8:
movs r0, 0
movs r1, 0x1F
adds r2, r5, 0
bl sub_80018D8
bl SetScriptVarValue
ldr r4, _080A1DE8
adds r0, r5, 0
bl GetFriendArea
@ -1010,7 +1010,7 @@ _080A1DA8:
lsrs r1, 24
adds r0, r4, 0
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
adds r0, r5, 0
bl GetFriendArea
lsls r0, 24
@ -1027,7 +1027,7 @@ _080A1DE8: .4byte gUnknown_202E628
_080A1DEC:
movs r0, 0
movs r1, 0x1F
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r5, r0, 16
ldr r4, _080A1E2C
@ -1038,7 +1038,7 @@ _080A1DEC:
lsrs r1, 24
adds r0, r4, 0
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
cmp r5, 0
bne _080A1E14
b _080A236A
@ -1067,7 +1067,7 @@ _080A1E3C:
_080A1E42:
movs r0, 0
movs r1, 0x1F
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r5, r0, 16
adds r6, r5, 0
@ -1079,7 +1079,7 @@ _080A1E42:
lsrs r1, 24
adds r0, r4, 0
movs r2, 0
bl sub_8092578
bl WriteFriendAreaName
cmp r5, 0
bne _080A1E6C
b _080A236A
@ -1171,7 +1171,7 @@ _080A1F28:
bl AddToTeamMoney
b _080A236A
.align 2, 0
_080A1F30: .4byte gUnknown_202DE58
_080A1F30: .4byte gFormatItems
_080A1F34: .4byte gUnknown_81167EC
_080A1F38: .4byte 0x00002710
_080A1F3C:
@ -1212,7 +1212,7 @@ _080A1F80:
negs r2, r2
movs r0, 0x3
movs r1, 0x12
bl sub_8001D44
bl ScriptVarScenarioAfter
lsls r0, 24
cmp r0, 0
bne _080A1F94
@ -1220,7 +1220,7 @@ _080A1F80:
_080A1F94:
movs r0, 0
movs r1, 0xF
bl sub_8001658
bl GetScriptVarValue
cmp r0, 0x4
bne _080A1FA2
b _080A236A
@ -1228,7 +1228,7 @@ _080A1FA2:
movs r0, 0
movs r1, 0x42
movs r2, 0
bl sub_8001784
bl GetScriptVarArrayValue
cmp r0, 0
ble _080A1FB2
b _080A236A
@ -1242,14 +1242,14 @@ _080A1FB2:
movs r1, 0x42
movs r2, 0
movs r3, 0x4
bl sub_800199C
bl SetScriptVarArrayValue
b _080A1EBE
_080A1FCC:
movs r0, 0
movs r1, 0x42
movs r2, 0
movs r3, 0x1
bl sub_800199C
bl SetScriptVarArrayValue
b _080A236A
_080A1FDA:
ldr r6, _080A200C
@ -1527,7 +1527,7 @@ _080A21F4:
movs r2, 0x80
lsls r2, 1
add r0, sp, 0x360
bl sub_8002BB8
bl SetVecFromDirectionSpeed
add r0, sp, 0x360
ldr r1, [r0, 0x4]
ldr r0, [r0]
@ -1687,7 +1687,7 @@ _080A234E:
movs r1, 0x2F
adds r2, r4, 0
movs r3, 0x1
bl sub_800199C
bl SetScriptVarArrayValue
adds r0, r5, 0
subs r0, 0x10
b _080A236C
@ -1695,7 +1695,7 @@ _080A2360:
movs r0, 0
movs r1, 0x1F
movs r2, 0
bl sub_80018D8
bl SetScriptVarValue
_080A236A:
movs r0, 0
_080A236C:
@ -1733,22 +1733,22 @@ _080A2390:
lsls r5, r6, 16
asrs r5, 16
adds r0, r5, 0
bl sub_80A4D2C
bl GroundMapNotifyAll
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
bl sub_80A8B1C
bl GroundLivesNotifyAll
orrs r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
bl sub_80AC320
bl GroundObjectsNotifyAll
orrs r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
bl sub_80AD238
bl GroundEffectsNotifyAll
orrs r4, r0
lsls r4, 24
lsrs r4, 24
@ -1765,13 +1765,13 @@ _080A2390:
lsls r4, 16
asrs r4, 16
adds r0, r4, 0
bl sub_80A4D2C
bl GroundMapNotifyAll
adds r0, r4, 0
bl sub_80A8B1C
bl GroundLivesNotifyAll
adds r0, r4, 0
bl sub_80AC320
bl GroundObjectsNotifyAll
adds r0, r4, 0
bl sub_80AD238
bl GroundEffectsNotifyAll
movs r0, 0
strb r0, [r5]
_080A240C:
@ -1785,10 +1785,10 @@ _080A2414:
pop {r0}
bx r0
.align 2, 0
_080A241C: .4byte gUnknown_2039A36
_080A2420: .4byte gUnknown_2039A38
_080A241C: .4byte gAnyScriptLocked
_080A2420: .4byte gScriptLocks
_080A2424: .4byte gUnknown_8116848
_080A2428: .4byte gUnknown_2039AC0
_080A2428: .4byte gScriptLockConds
thumb_func_end GroundScript_Unlock
.align 2,0

22
asm/ground_sprite.s
View File

@ -105,8 +105,8 @@ sub_80A6688:
bx r0
thumb_func_end sub_80A6688
thumb_func_start sub_80A66A4
sub_80A66A4:
thumb_func_start SpriteHasPokemonSize_80A66A4
SpriteHasPokemonSize_80A66A4:
push {lr}
movs r1, 0
adds r0, 0x48
@ -119,7 +119,7 @@ _080A66B4:
adds r0, r1, 0
pop {r1}
bx r1
thumb_func_end sub_80A66A4
thumb_func_end SpriteHasPokemonSize_80A66A4
thumb_func_start sub_80A66BC
sub_80A66BC:
@ -224,8 +224,8 @@ _080A6754:
bx r1
thumb_func_end sub_80A671C
thumb_func_start sub_80A675C
sub_80A675C:
thumb_func_start IsOnscreen_80A675C
IsOnscreen_80A675C:
push {r4-r6,lr}
sub sp, 0x8
adds r6, r1, 0
@ -287,7 +287,7 @@ _080A67C2:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80A675C
thumb_func_end IsOnscreen_80A675C
thumb_func_start sub_80A67CC
sub_80A67CC:
@ -1429,7 +1429,7 @@ _080A7016:
str r0, [sp, 0x8]
adds r0, r4, 0
adds r1, r5, 0
bl sub_80053D0
bl AxResInit_80053D0
_080A7038:
add sp, 0xC
pop {r4-r7}
@ -1772,7 +1772,7 @@ sub_80A72B8:
movs r0, 0
strh r0, [r1]
adds r0, r6, 0
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
b _080A7304
_080A72D2:
adds r5, r6, 0
@ -1795,7 +1795,7 @@ _080A72EE:
adds r0, r7, r1
strh r0, [r5]
adds r0, r6, 0
bl sub_80054BC
bl RunAxAnimationFrame_80054BC
movs r1, 0
ldrsh r0, [r4, r1]
cmp r0, 0xFF
@ -2153,7 +2153,7 @@ _080A758C:
add r1, sp, 0x14
mov r0, r8
adds r2, r5, 0
bl sub_808E668
bl AddShadowSprite
_080A75B4:
adds r0, r5, 0
adds r1, r6, 0
@ -2207,7 +2207,7 @@ sub_80A75CC:
str r0, [sp, 0x4]
b _080A762A
.align 2, 0
_080A7618: .4byte gUnknown_8117AE4
_080A7618: .4byte gGroundObjectKinds
_080A761C: .4byte 0xffff0000
_080A7620: .4byte 0x0000ffff
_080A7624: .4byte gOrnamentFileArchive

54
asm/handleaction.s
View File

@ -489,7 +489,7 @@ _0809E016:
bl _call_via_r2
adds r4, r0, 0
adds r0, r5, 0
bl sub_8002C60
bl VecDirection8Radial
lsls r0, 24
adds r2, r7, 0
adds r2, 0x4A
@ -595,7 +595,7 @@ _0809E0E8:
ldr r2, [r7, 0x54]
add r4, sp, 0xEC
adds r0, r4, 0
bl sub_8002BB8
bl SetVecFromDirectionSpeed
ldr r2, [r4]
ldr r3, [r4, 0x4]
add r1, sp, 0xF4
@ -738,7 +738,7 @@ _0809E20C:
lsls r0, 16
asrs r0, 16
adds r1, r4, 0
bl sub_80AD8B4
bl GroundLink_GetPos
_0809E234:
cmp r5, 0
beq _0809E282
@ -759,7 +759,7 @@ _0809E234:
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
bl sub_8002DF0
bl SizedDeltaDirection8
lsls r0, 24
asrs r0, 24
mov r8, r0
@ -771,7 +771,7 @@ _0809E234:
adds r0, r5, 0
adds r1, r3, 0
adds r2, r6, 0
bl sub_8002D54
bl SizedDeltaDirection4
lsls r0, 24
asrs r0, 24
mov r8, r0
@ -844,7 +844,7 @@ _0809E2F0:
ldr r1, [r0]
b _0809E8EC
.align 2, 0
_0809E304: .4byte gUnknown_2039B48
_0809E304: .4byte gUnlockBranchLabels
_0809E308:
adds r0, r7, 0
adds r0, 0x46
@ -909,7 +909,7 @@ _0809E376:
add r0, sp, 0x11C
ldr r1, [r0]
adds r0, r7, 0
bl sub_80A2460
bl ResolveJump
b _0809E8C8
_0809E382:
add r0, sp, 0x120
@ -941,7 +941,7 @@ _0809E390:
_0809E3BA:
ldr r1, [r4]
adds r0, r7, 0
bl sub_80A2460
bl ResolveJump
b _0809E8C8
_0809E3C4:
adds r4, r7, 0
@ -969,7 +969,7 @@ _0809E3DE:
asrs r2, 16
movs r0, 0
movs r1, 0x12
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x1
b _0809E402
_0809E400:
@ -990,14 +990,14 @@ _0809E40C:
str r0, [r1]
movs r0, 0
movs r1, 0x12
bl sub_8001658
bl GetScriptVarValue
adds r2, r0, 0
lsls r2, 16
asrs r4, r2, 16
lsrs r2, 16
movs r0, 0
movs r1, 0x30
bl sub_8001784
bl GetScriptVarArrayValue
cmp r4, 0x13
bne _0809E43C
cmp r0, 0
@ -1009,7 +1009,7 @@ _0809E43C:
bl sub_8098DCC
adds r0, r7, 0
movs r1, 0
bl sub_80A2460
bl ResolveJump
str r0, [r7, 0x28]
movs r0, 0
movs r1, 0
@ -1019,7 +1019,7 @@ _0809E45A:
movs r0, 0
movs r1, 0x13
movs r2, 0x13
bl sub_80018D8
bl SetScriptVarValue
_0809E464:
adds r0, r7, 0
adds r0, 0x4C
@ -1053,7 +1053,7 @@ _0809E49C:
asrs r2, r0, 16
movs r0, 0
movs r1, 0x13
bl sub_80018D8
bl SetScriptVarValue
movs r0, 0x1
b _0809E4AC
_0809E4AA:
@ -1075,7 +1075,7 @@ _0809E4B4:
_0809E4C4:
movs r0, 0
movs r1, 0x13
bl sub_8001658
bl GetScriptVarValue
lsls r0, 16
asrs r6, r0, 16
add r4, sp, 0x18
@ -1125,7 +1125,7 @@ _0809E524:
bne _0809E5B8
movs r0, 0
movs r1, 0x14
bl sub_8001658
bl GetScriptVarValue
lsls r0, 24
lsrs r0, 24
bl GetMailatIndex
@ -1171,7 +1171,7 @@ _0809E58E:
bl sub_809B1C0
adds r0, r7, 0
movs r1, 0x1
bl sub_809D8EC
bl GroundScriptCheckLockCondition
lsls r0, 24
cmp r0, 0
bne _0809E5A4
@ -1231,7 +1231,7 @@ _0809E608:
adds r0, r7, 0
movs r1, 0x1
_0809E60C:
bl sub_80A2460
bl ResolveJump
str r0, [r7, 0x28]
b _0809E9CC
_0809E614:
@ -1263,7 +1263,7 @@ _0809E63C:
movs r0, 0
movs r1, 0x13
adds r2, r4, 0
bl sub_80018D8
bl SetScriptVarValue
adds r0, r7, 0
adds r1, r4, 0
b _0809E8EE
@ -1310,7 +1310,7 @@ _0809E6A4:
add r0, sp, 0x134
ldr r1, [r0]
adds r0, r7, 0
bl sub_80A2460
bl ResolveJump
b _0809E8C8
.align 2, 0
_0809E6B0: .4byte gUnknown_2039D98
@ -1331,7 +1331,7 @@ _0809E6C2:
_0809E6D0:
ldr r1, [r4]
adds r0, r7, 0
bl sub_80A2460
bl ResolveJump
b _0809E8C8
.align 2, 0
_0809E6DC: .4byte gUnknown_2039D98
@ -1395,7 +1395,7 @@ _0809E74A:
add r0, sp, 0x13C
ldr r1, [r0]
adds r0, r7, 0
bl sub_80A2460
bl ResolveJump
b _0809E8C8
.align 2, 0
_0809E758: .4byte gUnknown_2039D98
@ -1515,7 +1515,7 @@ _0809E812:
bl sub_80A87AC
adds r0, r7, 0
movs r1, 0
bl sub_809D8EC
bl GroundScriptCheckLockCondition
lsls r0, 24
cmp r0, 0
beq _0809E844
@ -1593,7 +1593,7 @@ _0809E898:
ldrsh r1, [r0, r5]
_0809E8C2:
adds r0, r7, 0
bl sub_80A242C
bl FindLabel
_0809E8C8:
str r0, [r7, 0x28]
_0809E8CA:
@ -1619,14 +1619,14 @@ _0809E8D8:
_0809E8EC:
adds r0, r7, 0
_0809E8EE:
bl sub_80A2460
bl ResolveJump
str r0, [r7, 0x28]
_0809E8F4:
movs r0, 0x3
strh r0, [r7, 0x26]
b _0809E9CC
.align 2, 0
_0809E8FC: .4byte gUnknown_2039B48
_0809E8FC: .4byte gUnlockBranchLabels
_0809E900:
adds r0, r7, 0
bl ExecuteScriptCommand
@ -1768,7 +1768,7 @@ _0809E9DA:
ldr r2, [r4, 0x4]
subs r1, r2
str r1, [r0, 0x4]
bl sub_8002C60
bl VecDirection8Radial
lsls r0, 24
adds r2, r7, 0
adds r2, 0x4A

12
asm/pokemon.s
View File

@ -391,8 +391,8 @@ _0808D478:
bx r1
thumb_func_end sub_808D434
thumb_func_start sub_808D480
sub_808D480:
thumb_func_start GetFriendSum_808D480
GetFriendSum_808D480:
push {r4,r5,lr}
ldr r0, _0808D4A8
ldr r2, [r0]
@ -418,7 +418,7 @@ _0808D498:
.align 2, 0
_0808D4A8: .4byte gRecruitedPokemonRef
_0808D4AC: .4byte 0x0000019d
thumb_func_end sub_808D480
thumb_func_end GetFriendSum_808D480
thumb_func_start sub_808D4B0
sub_808D4B0:
@ -504,8 +504,8 @@ _0808D53C: .4byte gRecruitedPokemonRef
_0808D540: .4byte 0x0000fffd
thumb_func_end sub_808D500
thumb_func_start sub_808D544
sub_808D544:
thumb_func_start GetUnitSum_808D544
GetUnitSum_808D544:
push {r4-r7,lr}
adds r4, r0, 0
ldr r0, _0808D57C
@ -539,7 +539,7 @@ _0808D56C:
bx r1
.align 2, 0
_0808D57C: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D544
thumb_func_end GetUnitSum_808D544
thumb_func_start sub_808D580
sub_808D580:

10
asm/pokemon_2.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_808E53C
sub_808E53C:
thumb_func_start InitShadowSprites
InitShadowSprites:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@ -130,8 +130,8 @@ _0808E62C: .4byte gDungeonFileArchive
_0808E630: .4byte 0x06010000
_0808E634: .4byte 0x0000f3ff
_0808E638: .4byte 0x00003fff
_0808E63C: .4byte gUnknown_8107698
_0808E640: .4byte gUnknown_202F3E8
_0808E63C: .4byte gShadowSpriteSizeFlags_8107698
_0808E640: .4byte gShadowSprites
_0808E644: .4byte 0x0000feff
_0808E648: .4byte 0x0000fdff
_0808E64C: .4byte 0x0000efff
@ -141,6 +141,6 @@ _0808E658: .4byte 0x000003ff
_0808E65C: .4byte 0x00000fff
_0808E660: .4byte 0x0000fffe
_0808E664: .4byte 0x0000fffd
thumb_func_end sub_808E53C
thumb_func_end InitShadowSprites
.align 2, 0 @ Don't pad with nop.

6
asm/pokemon_3.s
View File

@ -367,7 +367,7 @@ _0808FA74:
b _0808FAA6
.align 2, 0
_0808FA94: .4byte gUnknown_810DE50
_0808FA98: .4byte gUnknown_202DE58
_0808FA98: .4byte gFormatItems
_0808FA9C:
ldr r0, _0808FB24
ldr r1, _0808FB28
@ -435,7 +435,7 @@ _0808FB10:
str r4, [sp]
b _0808FECC
.align 2, 0
_0808FB24: .4byte gUnknown_202DE58
_0808FB24: .4byte gFormatItems
_0808FB28: .4byte gUnknown_810DE58
_0808FB2C: .4byte gUnknown_810DE6C
_0808FB30: .4byte gFormatData_202DE30
@ -886,7 +886,7 @@ _0808FEEC: .4byte gUnknown_8107798
_0808FEF0: .4byte gAvailablePokemonNames
_0808FEF4: .4byte gFormatData_202DE30
_0808FEF8: .4byte gUnknown_810DEB4
_0808FEFC: .4byte gUnknown_202DE58
_0808FEFC: .4byte gFormatItems
_0808FF00: .4byte gUnknown_810DEC8
_0808FF04: .4byte gUnknown_810DEDC
_0808FF08: .4byte gUnknown_810DFB4

38
asm/text.s
View File

@ -1095,8 +1095,8 @@ _08008624:
_0800862C: .4byte gUnknown_80B86A4
thumb_func_end GetCharacter
thumb_func_start sub_8008630
sub_8008630:
thumb_func_start HexdigitValue
HexdigitValue:
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@ -1124,7 +1124,7 @@ _08008658:
_0800865C:
pop {r1}
bx r1
thumb_func_end sub_8008630
thumb_func_end HexdigitValue
thumb_func_start xxx_get_next_char_from_string
xxx_get_next_char_from_string:
@ -1136,10 +1136,10 @@ xxx_get_next_char_from_string:
bne _08008696
adds r5, 0x1
ldrb r0, [r5]
bl sub_8008630
bl HexdigitValue
adds r4, r0, 0
ldrb r0, [r5, 0x1]
bl sub_8008630
bl HexdigitValue
lsls r4, 4
adds r4, r0
ldrb r0, [r5]
@ -2000,25 +2000,25 @@ _08008C44:
bx r0
thumb_func_end sub_80089AC
thumb_func_start sub_8008C54
sub_8008C54:
thumb_func_start CallPrepareTextbox_8008C54
CallPrepareTextbox_8008C54:
push {lr}
adds r1, r0, 0
ldr r0, _08008C64
bl sub_8008C6C
bl PrepareTextbox_8008C6C
pop {r0}
bx r0
.align 2, 0
_08008C64: .4byte gUnknown_2027370
thumb_func_end sub_8008C54
thumb_func_end CallPrepareTextbox_8008C54
thumb_func_start nullsub_169
nullsub_169:
bx lr
thumb_func_end nullsub_169
thumb_func_start sub_8008C6C
sub_8008C6C:
thumb_func_start PrepareTextbox_8008C6C
PrepareTextbox_8008C6C:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@ -2164,7 +2164,7 @@ _08008D60:
.align 2, 0
_08008D84: .4byte 0xeeeeeeee
_08008D88: .4byte 0xdddddddd
thumb_func_end sub_8008C6C
thumb_func_end PrepareTextbox_8008C6C
thumb_func_start sub_8008D8C
sub_8008D8C:
@ -2745,8 +2745,8 @@ _08009186:
bx r1
thumb_func_end sub_800915C
thumb_func_start sub_8009190
sub_8009190:
thumb_func_start xxx_handle_format_global
xxx_handle_format_global:
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@ -2757,7 +2757,7 @@ sub_8009190:
bx r1
.align 2, 0
_080091A4: .4byte gUnknown_2027370
thumb_func_end sub_8009190
thumb_func_end xxx_handle_format_global
thumb_func_start sub_80091A8
sub_80091A8:
@ -2940,7 +2940,7 @@ _080092D4:
str r0, [r5, 0x18]
_080092DC:
ldrb r0, [r4, 0x2]
bl sub_800963C
bl InterpretColorChar
str r0, [r5, 0x10]
adds r4, 0x3
b _080091C0
@ -3425,8 +3425,8 @@ _08009638:
bx r1
thumb_func_end sub_8009614
thumb_func_start sub_800963C
sub_800963C:
thumb_func_start InterpretColorChar
InterpretColorChar:
push {lr}
lsls r0, 24
lsrs r0, 24
@ -3496,7 +3496,7 @@ _080096D8:
_080096DA:
pop {r1}
bx r1
thumb_func_end sub_800963C
thumb_func_end InterpretColorChar
thumb_func_start InitGraphics
InitGraphics:

24
data/data.s
View File

@ -5,8 +5,8 @@
.string "pksdir0\0"
.align 2, 0
.global gUnknown_80B6D30
gUnknown_80B6D30:
.global gLocalScriptVarInfo
gLocalScriptVarInfo:
.2byte 5, 7, 0, 0, 1, 0; .4byte gUnknown_80B6D88
.2byte 5, 7, 2, 0, 1, 0; .4byte gUnknown_80B6D80
.2byte 5, 7, 4, 0, 1, 0; .4byte gUnknown_80B6D78
@ -587,8 +587,8 @@ gUnknown_80B7388: @ 80B7388
@ code.c
.string "pksdir0\0"
.global gUnknown_80B7394
gUnknown_80B7394: @ 80B7394
.global gScriptVarInfo
gScriptVarInfo: @ 80B7394
.2byte 6, 2, 0, 0, 1, 29; .4byte gUnknown_80B7DF8
.2byte 6, 2, 4, 0, 1, 0; .4byte gUnknown_80B7DEC
.2byte 2, 2, 110, 0, 2, 0; .4byte gUnknown_80B7DDC
@ -1010,8 +1010,8 @@ gUnknown_80B7DF8:
.string "pksdir0\0"
.fill 8, 1, 0
.global gUnknown_80B7E3C
gUnknown_80B7E3C: @ 80B7E3C
.global gVectorDirections
gVectorDirections: @ 80B7E3C
.4byte 0, 1, 1, 1, 1, 0, 1, -1, 0, -1, -1, -1, -1, 0, -1, 1
@ ???
@ -1787,8 +1787,8 @@ gUnknown_80B857C: @ 80B857C
.4byte 0, 3, 0, 0, 0, 0
.4byte 0, 3, 0, 0, 0, 0
.global gUnknown_80B85DC
gUnknown_80B85DC: @ 80B85DC
.global gCharMasksOffsets
gCharMasksOffsets: @ 80B85DC
@ Type: unkShiftData[8]
.4byte 0xFFFFFFFF, 0x00000000, 0x00, 0x20
.4byte 0x0FFFFFFF, 0xF0000000, 0x04, 0x1C
@ -1834,8 +1834,8 @@ gKanjiB_file_string: @ 80B87BC
.string "kanji_b\0"
.align 2,0
.global gUnknown_80B87C4
gUnknown_80B87C4: @ 80B87C4
.global gFadeInNone
gFadeInNone: @ 80B87C4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@ -1845,8 +1845,8 @@ gUnknown_80B87C4: @ 80B87C4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80B87E4
gUnknown_80B87E4: @ 80B87E4
.global gFadeInDungeon
gFadeInDungeon: @ 80B87E4
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88
.byte 0x88, 0x88, 0x88, 0x88

144
data/data_80F59C8.s
View File

@ -2102,16 +2102,16 @@ gUnknown_80F8C14: @ 80F8C14
.string "It can{APOSTROPHE}t be moved.\0"
.align 2, 0
.global gUnknown_80F8C40
gUnknown_80F8C40: @ 80F8C40
.global gItemStickyCannotMove1
gItemStickyCannotMove1: @ 80F8C40
.4byte gUnknown_80F8C14
.global gUnknown_80F8C44
gUnknown_80F8C44: @ 80F8C44
.global gItemStickyCannotMove2
gItemStickyCannotMove2: @ 80F8C44
.4byte gUnknown_80F8C14
.global gUnknown_80F8C48
gUnknown_80F8C48: @ 80F8C48
.global gItemStickyCannotMove3
gItemStickyCannotMove3: @ 80F8C48
.4byte gUnknown_80F8C14
.global gUnknown_80F8C4C
@ -2120,8 +2120,8 @@ gUnknown_80F8C4C: @ 80F8C4C
.string "It can{APOSTROPHE}t be equipped.\0"
.align 2,0
.global gUnknown_80F8C7C
gUnknown_80F8C7C: @ 80F8C7C
.global gItemStickyCannotEquip
gItemStickyCannotEquip: @ 80F8C7C
.4byte gUnknown_80F8C4C
.global gUnknown_80F8C80
@ -2130,8 +2130,8 @@ gUnknown_80F8C80: @ 80F8C80
.string "and returned the {ARG_MOVE_ITEM_1}.\0"
.align 2,0
.global gUnknown_80F8CA8
gUnknown_80F8CA8: @ 80F8CA8
.global gMonTookAndReturnedItem
gMonTookAndReturnedItem: @ 80F8CA8
@ replacing .incbin "baserom.gba", 0xF8CA8, 0x3C
.4byte gUnknown_80F8C80
@ -2251,8 +2251,8 @@ gUnknown_80F8E30: @ 80F8E30
.string "Items can{APOSTROPHE}t be exchanged here.\0"
.align 2, 0
.global gUnknown_80F8E54
gUnknown_80F8E54: @ 80F8E54
.global gNoExchangesHere
gNoExchangesHere: @ 80F8E54
@ replacing .incbin "baserom.gba", 0xF8E54, 0x24
.4byte gUnknown_80F8E30
@ -2261,8 +2261,8 @@ gUnknown_80F8E58: @ 80F8E58
.string "Nothing can be put down here.\0"
.align 2, 0
.global gUnknown_80F8E78
gUnknown_80F8E78: @ 80F8E78
.global gNothingCanBePutDownHere
gNothingCanBePutDownHere: @ 80F8E78
@ replacing .incbin "baserom.gba", 0xF8E78, 0x34
.4byte gUnknown_80F8E58
@ -2272,8 +2272,8 @@ gUnknown_80F8E7C: @ 80F8E7C
.string "ground with the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F8EAC
gUnknown_80F8EAC: @ 80F8EAC
.global gSwappedGroundItem
gSwappedGroundItem: @ 80F8EAC
@ replacing .incbin "baserom.gba", 0xF8EAC, 0x18
.4byte gUnknown_80F8E7C
@ -2282,13 +2282,13 @@ gUnknown_80F8EB0: @ 80F8EB0
.string "{ARG_POKEMON_0} threw the {ARG_MOVE_ITEM_0}!\0"
.align 2, 0
.global gUnknown_80F8EC4
gUnknown_80F8EC4: @ 80F8EC4
.global gMonThrewItem1
gMonThrewItem1: @ 80F8EC4
@ replacing .incbin "baserom.gba", 0xF8EC4, 0x4
.4byte gUnknown_80F8EB0
.global gUnknown_80F8EC8
gUnknown_80F8EC8: @ 80F8EC8
.global gMonThrewItem2
gMonThrewItem2: @ 80F8EC8
@ replacing .incbin "baserom.gba", 0xF8EC8, 0x1C
.4byte gUnknown_80F8EB0
@ -2297,8 +2297,8 @@ gUnknown_80F8ECC: @ 80F8ECC
.string "You can{APOSTROPHE}t talk now.\0"
.align 2, 0
.global gUnknown_80F8EE4
gUnknown_80F8EE4: @ 80F8EE4
.global gCannotTalk
gCannotTalk: @ 80F8EE4
@ replacing .incbin "baserom.gba", 0xF8EE4, 0x24
.4byte gUnknown_80F8ECC
@ -2307,8 +2307,8 @@ gUnknown_80F8EE8: @ 80F8EE8
.string "You can{APOSTROPHE}t say farewell now.\0"
.align 2, 0
.global gUnknown_80F8F08
gUnknown_80F8F08: @ 80F8F08
.global gCannotFarewell
gCannotFarewell: @ 80F8F08
@ replacing .incbin "baserom.gba", 0xF8F08, 0x18
.4byte gUnknown_80F8EE8
@ -2317,8 +2317,8 @@ gUnknown_80F8F0C: @ 80F8F0C
.string "{ARG_POKEMON_0} is cringing!\0"
.align 2, 0
.global gUnknown_80F8F20
gUnknown_80F8F20: @ 80F8F20
.global gMonCringing
gMonCringing: @ 80F8F20
@ replacing .incbin "baserom.gba", 0xF8F20, 0x18
.4byte gUnknown_80F8F0C
@ -2327,8 +2327,8 @@ gUnknown_80F8F24: @ 80F8F24
.string "{ARG_POKEMON_0} is paralyzed!\0"
.align 2, 0
.global gUnknown_80F8F38
gUnknown_80F8F38: @ 80F8F38
.global gMonParalyzed
gMonParalyzed: @ 80F8F38
@ replacing .incbin "baserom.gba", 0xF8F38, 0x1C
.4byte gUnknown_80F8F24
@ -2338,8 +2338,8 @@ gUnknown_80F8F3C: @ 80F8F3C
.string "the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F8F54
gUnknown_80F8F54: @ 80F8F54
.global gMonSteppedOnItem
gMonSteppedOnItem: @ 80F8F54
@ replacing .incbin "baserom.gba", 0xF8F54, 0x34
.4byte gUnknown_80F8F3C
@ -2349,8 +2349,8 @@ gUnknown_80F8F58: @ 80F8F58
.string "It didn{APOSTROPHE}t pick up the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F8F88
gUnknown_80F8F88: @ 80F8F88
.global gMonTerrifiedCouldntPickUpItem
gMonTerrifiedCouldntPickUpItem: @ 80F8F88
@ replacing .incbin "baserom.gba", 0xF8F88, 0x24
.4byte gUnknown_80F8F58
@ -2360,8 +2360,8 @@ gUnknown_80F8F8C: @ 80F8F8C
.string "the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F8FAC
gUnknown_80F8FAC: @ 80F8FAC
.global gMonCouldntPickUpItem
gMonCouldntPickUpItem: @ 80F8FAC
@ replacing .incbin "baserom.gba", 0xF8FAC, 0x18
.4byte gUnknown_80F8F8C
@ -2370,8 +2370,8 @@ gUnknown_80F8FB0: @ 80F8FB0
.string "Picked up the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F8FC4
gUnknown_80F8FC4: @ 80F8FC4
.global gPickedUpItem2
gPickedUpItem2: @ 80F8FC4
@ replacing .incbin "baserom.gba", 0xF8FC4, 0x34
.4byte gUnknown_80F8FB0
@ -2381,13 +2381,13 @@ gUnknown_80F8FC8: @ 80F8FC8
.string "put it in the Toolbox.\0"
.align 2, 0
.global gUnknown_80F8FF8
gUnknown_80F8FF8: @ 80F8FF8
.global gPickedUpItemToolbox
gPickedUpItemToolbox: @ 80F8FF8
@ replacing .incbin "baserom.gba", 0xF8FF8, 0x4
.4byte gUnknown_80F8FC8
.global gUnknown_80F8FFC
gUnknown_80F8FFC: @ 80F8FFC
.global gPickedUpItem
gPickedUpItem: @ 80F8FFC
@ replacing .incbin "baserom.gba", 0xF8FFC, 0x1C
.4byte gUnknown_80F8FB0
@ -2397,8 +2397,8 @@ gUnknown_80F9000: @ 80F9000
.string "the {ARG_MOVE_ITEM_0}.\0"
.align 2, 0
.global gUnknown_80F9018
gUnknown_80F9018: @ 80F9018
.global gMonPickedUpItem2
gMonPickedUpItem2: @ 80F9018
@ replacing .incbin "baserom.gba", 0xF9018, 0x38
.4byte gUnknown_80F9000
@ -2408,13 +2408,13 @@ gUnknown_80F901C: @ 80F901C
.string "{ARG_MOVE_ITEM_0} and put it in the Toolbox.\0"
.align 2, 0
.global gUnknown_80F9050
gUnknown_80F9050: @ 80F9050
.global gMonPickedUpItemToolbox
gMonPickedUpItemToolbox: @ 80F9050
@ replacing .incbin "baserom.gba", 0xF9050, 0x4
.4byte gUnknown_80F901C
.global gUnknown_80F9054
gUnknown_80F9054: @ 80F9054
.global gMonPickedUpItem
gMonPickedUpItem: @ 80F9054
@ replacing .incbin "baserom.gba", 0xF9054, 0x40
.4byte gUnknown_80F9000
@ -2424,8 +2424,8 @@ gUnknown_80F9058: @ 80F9058
.string "It will be gone from the team forever.\0"
.align 2, 0
.global gUnknown_80F9094
gUnknown_80F9094: @ 80F9094
.global gSayFarewellQ
gSayFarewellQ: @ 80F9094
@ replacing .incbin "baserom.gba", 0xF9094, 0x34
.4byte gUnknown_80F9058
@ -2435,8 +2435,8 @@ gUnknown_80F9098: @ 80F9098
.string "{ARG_POKEMON_0}{APOSTROPHE}s hold item will be lost.\0"
.align 2, 0
.global gUnknown_80F90C8
gUnknown_80F90C8: @ 80F90C8
.global gSendMonBackWithItemQ
gSendMonBackWithItemQ: @ 80F90C8
@ replacing .incbin "baserom.gba", 0xF90C8, 0x14
.4byte gUnknown_80F9098
@ -2445,8 +2445,8 @@ gUnknown_80F90CC: @ 80F90CC
.string "Send {ARG_POKEMON_0} back?\0"
.align 2, 0
.global gUnknown_80F90DC
gUnknown_80F90DC: @ 80F90DC
.global gSendMonBackQ
gSendMonBackQ: @ 80F90DC
@ replacing .incbin "baserom.gba", 0xF90DC, 0x38
.4byte gUnknown_80F90CC
@ -2476,13 +2476,13 @@ gUnknown_80F9140: @ 80F9140
.string "{ARG_POKEMON_0} went back.\0"
.align 2, 0
.global gUnknown_80F9150
gUnknown_80F9150: @ 80F9150
.global gMonWentBack
gMonWentBack: @ 80F9150
@ replacing .incbin "baserom.gba", 0xF9150, 0x4
.4byte gUnknown_80F9140
.global gUnknown_80F9154
gUnknown_80F9154: @ 80F9154
.global gMonDisappointedAndLeft
gMonDisappointedAndLeft: @ 80F9154
@ replacing .incbin "baserom.gba", 0xF9154, 0x4
.4byte gUnknown_80F9118
@ -2725,8 +2725,8 @@ gUnknown_80F93CC: @ 80F93CC
.string "The {ARG_MOVE_ITEM_0} fell on the ground.\0"
.align 2, 0
.global gUnknown_80F93E8
gUnknown_80F93E8: @ 80F93E8
.global gItemFellOnGround
gItemFellOnGround: @ 80F93E8
@ replacing .incbin "baserom.gba", 0xF93E8, 0x20
.4byte gUnknown_80F93CC
@ -2735,8 +2735,8 @@ gUnknown_80F93EC: @ 80F93EC
.string "The {ARG_MOVE_ITEM_0} fell in the water.\0"
.align 2, 0
.global gUnknown_80F9408
gUnknown_80F9408: @ 80F9408
.global gItemFellInWater
gItemFellInWater: @ 80F9408
@ replacing .incbin "baserom.gba", 0xF9408, 0x1C
.4byte gUnknown_80F93EC
@ -2745,8 +2745,8 @@ gUnknown_80F940C: @ 80F940C
.string "The {ARG_MOVE_ITEM_0} became buried.\0"
.align 2, 0
.global gUnknown_80F9424
gUnknown_80F9424: @ 80F9424
.global gItemBuried
gItemBuried: @ 80F9424
@ replacing .incbin "baserom.gba", 0xF9424, 0x18
.4byte gUnknown_80F940C
@ -2755,8 +2755,8 @@ gUnknown_80F9428: @ 80F9428
.string "The {ARG_MOVE_ITEM_0} was lost!\0"
.align 2, 0
.global gUnknown_80F943C
gUnknown_80F943C: @ 80F943C
.global gItemLost
gItemLost: @ 80F943C
@ replacing .incbin "baserom.gba", 0xF943C, 0x20
.4byte gUnknown_80F9428
@ -2765,8 +2765,8 @@ gUnknown_80F9440: @ 80F9440
.string "All the items were lost!\0"
.align 2, 0
.global gUnknown_80F945C
gUnknown_80F945C: @ 80F945C
.global gAllItemsLost
gAllItemsLost: @ 80F945C
@ replacing .incbin "baserom.gba", 0xF945C, 0x20
.4byte gUnknown_80F9440
@ -2775,8 +2775,8 @@ gUnknown_80F9460: @ 80F9460
.string "Several items were lost!\0"
.align 2, 0
.global gUnknown_80F947C
gUnknown_80F947C: @ 80F947C
.global gSeveralItemsLost
gSeveralItemsLost: @ 80F947C
@ replacing .incbin "baserom.gba", 0xF947C, 0x20
.4byte gUnknown_80F9460
@ -2785,8 +2785,8 @@ gUnknown_80F9480: @ 80F9480
.string "The {ARG_MOVE_ITEM_0} fell out of sight!\0"
.align 2, 0
.global gUnknown_80F949C
gUnknown_80F949C: @ 80F949C
.global gItemFellOutOfSight
gItemFellOutOfSight: @ 80F949C
@ replacing .incbin "baserom.gba", 0xF949C, 0x28
.4byte gUnknown_80F9480
@ -8518,8 +8518,8 @@ gUnknown_80FE3C0: @ 80FE3C0
.string "It doesn{APOSTROPHE}t work!\0"
.align 2, 0
.global gUnknown_80FE3E8
gUnknown_80FE3E8: @ 80FE3E8
.global gItemStickyDoesntWorkText
gItemStickyDoesntWorkText: @ 80FE3E8
@ replacing .incbin "baserom.gba", 0xFE3E8, 0x24
.4byte gUnknown_80FE3C0

36
data/data_8106A4C.s
View File

@ -72,43 +72,43 @@ gUnknown_8106B8C: @ 8106B8C
.byte 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_8106BB0
gUnknown_8106BB0: @ 8106BB0
.global gTeamFormat
gTeamFormat: @ 8106BB0
.string "$t\0"
.align 2,0
@ Red Heart Symbols
.global gUnknown_8106BB4
gUnknown_8106BB4: @ 8106BB4
.global gHeartRedTiny
gHeartRedTiny: @ 8106BB4
.byte 0x87, 0x46, 0x00, 0x00
.global gUnknown_8106BB8
gUnknown_8106BB8: @ 8106BB8
.global gHeartRedSmall
gHeartRedSmall: @ 8106BB8
.byte 0x87, 0x47, 0x00, 0x00
.global gUnknown_8106BBC
gUnknown_8106BBC: @ 8106BBC
.global gHeartRedMedium
gHeartRedMedium: @ 8106BBC
.byte 0x87, 0x48, 0x00, 0x00
.global gUnknown_8106BC0
gUnknown_8106BC0: @ 8106BC0
.global gHeartRedLarge
gHeartRedLarge: @ 8106BC0
.byte 0x87, 0x49, 0x00, 0x00
@ Yellow Heart Symbols
.global gUnknown_8106BC4
gUnknown_8106BC4: @ 8106BC4
.global gHeartYellowTiny
gHeartYellowTiny: @ 8106BC4
.byte 0x87, 0x4A, 0x00, 0x00
.global gUnknown_8106BC8
gUnknown_8106BC8: @ 8106BC8
.global gHeartYellowSmall
gHeartYellowSmall: @ 8106BC8
.byte 0x87, 0x4B, 0x00, 0x00
.global gUnknown_8106BCC
gUnknown_8106BCC: @ 8106BCC
.global gHeartYellowMedium
gHeartYellowMedium: @ 8106BCC
.byte 0x87, 0x4C, 0x00, 0x00
.global gUnknown_8106BD0
gUnknown_8106BD0: @ 8106BD0
.global gHeartYellowLarge
gHeartYellowLarge: @ 8106BD0
.byte 0x87, 0x4D, 0x00, 0x00
.global gUnknown_8106BD4

20
data/data_8107010.s
View File

@ -92,12 +92,12 @@ gUnknown_8107178: @ 8107178
@ sub_8080B30 - sub_808217C
.string "pksdir0\0"
.global gUnknown_81071D4
gUnknown_81071D4: @ 81071D4
.global gYayoiSan
gYayoiSan: @ 81071D4
.byte 0x82, 0xe2, 0x82, 0xe6, 0x82, 0xa2, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00
.global gUnknown_81071E0
gUnknown_81071E0: @ 81071E0
.global gMisakiSan
gMisakiSan: @ 81071E0
.byte 0x82, 0xdd, 0x82, 0xb3, 0x82, 0xab, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00
@ ???
.string "pksdir0\0"
@ -304,8 +304,8 @@ gUnknown_810768C: @ 810768C
.string "lvmp%03d\0"
.align 2,0
.global gUnknown_8107698
gUnknown_8107698: @ 8107698
.global gShadowSpriteSizeFlags_8107698
gShadowSpriteSizeFlags_8107698: @ 8107698
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
@ -1432,13 +1432,13 @@ gUnknown_81097A4: @ 81097A4
.string "%s{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0"
.align 2, 0
.global gUnknown_81097B0
gUnknown_81097B0: @ 81097B0
.global gPowersOfTen
gPowersOfTen: @ 81097B0
@ replacing .incbin "baserom.gba", 0x001097b0, 0x14
.byte 0xa0, 0x86, 0x01, 0x00, 0x10, 0x27, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00
.global gUnknown_81097C4
gUnknown_81097C4: @ 81097C4
.global gHighDigits
gHighDigits: @ 81097C4
.byte 0x83
.global gUnknown_81097C5

174
data/data_8115F5C.s
View File

@ -94,12 +94,12 @@ gUndefineText: @ 811616C
.string "{COLOR_1 RED_2}undefine{END_COLOR_TEXT_1}\0"
.align 2,0
.global gUnknown_811617C
gUnknown_811617C: @ 811617C
.global gSpeechBubbleChar
gSpeechBubbleChar: @ 811617C
.byte 0x87, 0x45, 0x00, 0x00
.global gUnknown_8116180
gUnknown_8116180: @ 8116180
.global gFormattedSpeechBubble
gFormattedSpeechBubble: @ 8116180
.string "{COLOR_1 YELLOW_5}{SPEECH_BUBBLE}{END_COLOR_TEXT_1}\0"
.global gUnknown_8116188
@ -336,15 +336,15 @@ gUnknown_811642C: @ 811642C
.string "pksdir0\0"
.align 2,0
.global gUnknown_8116478
gUnknown_8116478: @ 8116478
.global gZeroPos_8116478
gZeroPos_8116478: @ 8116478
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.string "pksdir0\0"
.align 2,0
.global gUnknown_8116488
gUnknown_8116488: @ 8116488
.global gGroundScriptTriggerCallbacks
gGroundScriptTriggerCallbacks: @ 8116488
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -974,8 +974,8 @@ gUnknown_8117354: @ 8117354
.byte 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb0, 0x04, 0x01, 0x00, 0x01, 0x00, 0xbc, 0x00, 0x5e, 0x00, 0x00, 0x00
.4byte sub_80A5204
.global gUnknown_811736C
gUnknown_811736C: @ 811736C
.global gGroundScriptNullCallbacks
gGroundScriptNullCallbacks: @ 811736C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -1432,8 +1432,8 @@ gUnknown_8117ADC: @ 8117ADC
.string "flag00c\0"
.align 2, 0
.global gUnknown_8117AE4
gUnknown_8117AE4: @ 8117AE4
.global gGroundObjectKinds
gGroundObjectKinds: @ 8117AE4
@ replacing .incbin "baserom.gba", 0x117AE4, 0x3A8
.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -1752,35 +1752,35 @@ gUnknown_8117EDC: @ 8117EDC
.string "pksdir0\0"
.align 2,0
.global gUnknown_8117EFC
gUnknown_8117EFC: @ 8117EFC
.global gNullGroundScript
gNullGroundScript: @ 8117EFC
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.string "pksdir0\0"
.align 2,0
.global gUnknown_8117F10
gUnknown_8117F10: @ 8117F10
.global gGroundLivesCallbacks
gGroundLivesCallbacks: @ 8117F10
.byte 0x01, 0x00, 0x00, 0x00
.4byte sub_80AB008
.4byte sub_80AB010
.4byte sub_80AB0E0
.4byte sub_80AB10C
.4byte sub_80AB138
.4byte sub_80AB20C
.4byte sub_80AB01C
.4byte sub_80AB0C8
.4byte sub_80AB100
.4byte sub_80AB12C
.4byte sub_80AB144
.4byte sub_80AB184
.4byte CallbackLivesGetIndex
.4byte CallbackLivesGetSize
.4byte CallbackLivesGetHitboxCenter
.4byte CallbackLivesGetPosHeightAndUnk
.4byte CallbackLivesGetDirection
.4byte CallbackLivesGetFlags
.4byte CallbackLivesSetHitboxPos
.4byte CallbackLivesSetPositionBounds
.4byte CallbackLivesMoveReal
.4byte CallbackLivesSetPosHeight
.4byte CallbackLivesSetDirection
.4byte CallbackLivesSetEventIndex
.4byte nullsub_211
.4byte sub_80AB194
.4byte sub_80AB218
.4byte sub_80AB228
.4byte sub_80AB238
.4byte sub_80AB248
.4byte sub_80AB1C0
.4byte sub_80AB1E4
.4byte CallbackLivesSetUnk_80AB194
.4byte CallbackLivesSetFlags
.4byte CallbackLivesClearFlags
.4byte CallbackLivesSpriteRelated_80AB238
.4byte CallbackLivesMoveRelative
.4byte CallbackLivesSpriteRelatedCheck_80AB1C0
.4byte CallbackLivesSpriteRelated_80AB1E4
.global gUnknown_8117F64
gUnknown_8117F64: @ 8117F64
@ -1965,30 +1965,30 @@ gUnknown_811828C: @ 811828C
.string "pksdir0\0"
.align 2,0
.global gUnknown_81182A0
gUnknown_81182A0: @ 81182A0
.global gGroundObjectCallbacks
gGroundObjectCallbacks: @ 81182A0
@ replacing .incbin "baserom.gba", 0x1182A0, 0x54
.byte 0x02, 0x00, 0x00, 0x00
.4byte sub_80AC7E0
.4byte sub_80AC7E8
.4byte sub_80AC8B8
.4byte sub_80AC8E4
.4byte sub_80AC910
.4byte sub_80ACA04
.4byte sub_80AC7F4
.4byte sub_80AC8A0
.4byte sub_80AC8D8
.4byte sub_80AC904
.4byte sub_80AC91C
.4byte sub_80AC938
.4byte CallbackObjectGetIndex
.4byte CallbackObjectGetSize
.4byte CallbackObjectGetHitboxCenter
.4byte CallbackObjectGetPosHeightAndUnk
.4byte CallbackObjectGetDirection
.4byte CallbackObjectGetFlags
.4byte CallbackObjectSetHitboxPos
.4byte CallbackObjectSetPositionBounds
.4byte CallbackObjectMoveReal
.4byte CallbackObjectSetPosHeight
.4byte CallbackObjectSetDirection
.4byte CallbackObjectSetEventIndex
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_80AC998
.4byte sub_80ACA10
.4byte sub_80ACA20
.4byte CallbackObjectSetUnk_80AC998
.4byte CallbackObjectSetFlags
.4byte CallbackObjectClearFlags
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_80ACA30
.4byte sub_80AC9B8
.4byte sub_80AC9DC
.4byte CallbackObjectMoveRelative
.4byte CallbackObjectSpriteRelatedCheck_80AC9B8
.4byte CallbackObjectSpriteRelated_80AC9DC
.global gUnknown_81182F4
gUnknown_81182F4: @ 81182F4
@ -2098,30 +2098,30 @@ gUnknown_8118530: @ 8118530
.string "pksdir0\0"
.align 2,0
.global gUnknown_8118544
gUnknown_8118544: @ 8118544
.global gGroundEffectCallbacks
gGroundEffectCallbacks: @ 8118544
@ replacing .incbin "baserom.gba", 0x118544, 0xAE
.byte 0x03, 0x00, 0x00, 0x00
.4byte sub_80AD4B8
.4byte sub_80AD4C0
.4byte sub_80AD590
.4byte sub_80AD5BC
.4byte sub_80AD5E8
.4byte sub_80AD6DC
.4byte sub_80AD4CC
.4byte sub_80AD578
.4byte sub_80AD5B0
.4byte sub_80AD5DC
.4byte sub_80AD5F4
.4byte sub_80AD610
.4byte CallbackEffectGetIndex
.4byte CallbackEffectGetSize
.4byte CallbackEffectGetHitboxCenter
.4byte CallbackEffectGetPosHeightAndUnk
.4byte CallbackEffectGetDirection
.4byte CallbackEffectGetFlags
.4byte CallbackEffectSetHitboxPos
.4byte CallbackEffectSetPositionBounds
.4byte CallbackEffectMoveReal
.4byte CallbackEffectSetPosHeight
.4byte CallbackEffectSetDirection
.4byte CallbackEffectSetEventIndex
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_80AD670
.4byte sub_80AD6E8
.4byte sub_80AD6F8
.4byte CallbackEffectSetUnk_80AD670
.4byte CallbackEffectSetFlags
.4byte CallbackEffectClearFlags
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_80AD708
.4byte sub_80AD690
.4byte sub_80AD6B4
.4byte CallbackEffectMoveRelative
.4byte CallbackEffectSpriteRelatedCheck_80AD690
.4byte CallbackEffectSpriteRelated_80AD6B4
.byte 0xf6, 0x00, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_81185D8
.byte 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -8852,8 +8852,8 @@ gUnknown_811E5F4: @ 811E5F4
.byte 0x01, 0x00, 0xf1, 0x00, 0x01, 0x00, 0xf2, 0x00, 0x01, 0x00, 0xf3, 0x00, 0x01, 0x00, 0xf4, 0x00
.byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.global gUnknown_811E63C
gUnknown_811E63C: @ 811E63C
.global gGroundLivesTypeData_811E63C
gGroundLivesTypeData_811E63C: @ 811E63C
@ replacing .incbin "baserom.gba", 0x11E63C, 0x6E4
.byte 0x01, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
@ -9190,8 +9190,8 @@ gUnknown_811ED14: @ 811ED14
.byte 0x2d, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64
.byte 0x69, 0x72, 0x30, 0x00
.global gUnknown_811ED20
gUnknown_811ED20: @ 811ED20
.global gGroundObjectTypes
gGroundObjectTypes: @ 811ED20
@ replacing .incbin "baserom.gba", 0x11ED20, 0x118
.byte 0x01, 0x00, 0x01, 0x01, 0x0e, 0x00, 0x01, 0x01, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x01, 0x04, 0x00, 0x00, 0x00
@ -9212,8 +9212,8 @@ gUnknown_811ED20: @ 811ED20
.byte 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x02, 0x02, 0x0a, 0x00, 0x02, 0x02, 0x0e, 0x00, 0x02, 0x02
.byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.global gFunctionScriptData
gFunctionScriptData: @ 811EE38
.global gGroundEffectTypes
gGroundEffectTypes: @ 811EE38
@ replacing .incbin "baserom.gba", 0x11EE38, 0x103C0
.byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
@ -9255,8 +9255,8 @@ gUnknown_811EF28: @ 811EF28
.byte 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global gUnknown_811EF58
gUnknown_811EF58: @ 811EF58
.global gUnregisteredDialogScript
gUnregisteredDialogScript: @ 811EF58
.byte 0xf6, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_811EEA4
.byte 0x32, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -10127,8 +10127,8 @@ gUnknown_8120BBC: @ 8120BBC
.string "\0"
.align 2, 0
.global gUnknown_8120BDC
gUnknown_8120BDC: @ 8120BDC
.global gNextSaveFunc
gNextSaveFunc: @ 8120BDC
.byte 0xf6, 0x00, 0x5b, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_811EEA4
.byte 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ -15969,7 +15969,7 @@ gFunctionScriptTable: @ 812F1F8
.4byte gUnknown_811EF28
.byte 0x04, 0x00, 0x04, 0x00
.4byte gUnknown_8132320
.4byte gUnknown_811EF58
.4byte gUnregisteredDialogScript
.byte 0x05, 0x00, 0x04, 0x00
.4byte gUnknown_8132308
.4byte gUnknown_811EFA8
@ -16144,7 +16144,7 @@ gFunctionScriptTable: @ 812F1F8
.4byte gUnknown_8120B2C
.byte 0x3f, 0x00, 0x07, 0x00
.4byte gUnknown_8131ED8
.4byte gUnknown_8120BDC
.4byte gNextSaveFunc
.byte 0x40, 0x00, 0x07, 0x00
.4byte gUnknown_8131EC8
.4byte gUnknown_8120CDC

2
data/data_8270000.s
View File

@ -480,7 +480,7 @@ gUnknown_8270000: @ 8270000
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_203B4B8 + 0x4
.4byte gCurrentGroundLink + 0x4
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x43, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00

8
data/data_code_2.s
View File

@ -2,8 +2,8 @@
.string "pksdir0\0"
.global gUnknown_80B690C
gUnknown_80B690C: @ 80B690C
.global gBaseKindTable
gBaseKindTable: @ 80B690C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x19, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
@ -39,8 +39,8 @@ gUnknown_80B690C: @ 80B690C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80B6994
gUnknown_80B6994: @ 80B6994
.global gTalkKindTable
gTalkKindTable: @ 80B6994
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00

2
include/code_80130A8.h
View File

@ -11,7 +11,7 @@ extern void sub_8013F84(void);
extern void sub_80140B4(UnkTextStruct2 *);
extern void sub_80140DC(void);
extern void sub_8014114(void);
extern void sub_80141B4(const u8 *, u32, OpenedFile **, u16);
extern void xxx_info_box_80141B4(const u8 *, u32, OpenedFile **, u16);
extern void sub_8014248(const u8 *, u32, u32, const MenuItem *, void *, u32, u32, OpenedFile **, u32);
extern s32 sub_80144A4(s32 *);
extern void sub_80151C0(u32, u8 *);

4
include/code_805D8C8.h
View File

@ -7,7 +7,7 @@ void CloseAllSpriteFiles(void);
void sub_8068768(void);
void sub_80687AC(void);
OpenedFile *sub_80687D0(s16 species);
void sub_8068838(s16 id, bool32);
OpenedFile *GetSpriteData(s16 species);
void LoadPokemonSprite(s16 id, bool32);
#endif // GUARD_CODE_805D8C8_H

2
include/code_80972F4.h
View File

@ -24,6 +24,6 @@ const u8 *sub_80975DC(u32);
// These two are definitely bool8 but can't get them to match with it yet
//bool8 sub_8097384(s16);
//bool8 sub_80973F4(s16);
//bool8 RescueScenarioConquered(s16);
#endif // GUARD_CODE_80972F4_H

4
include/code_80A26CC.h
View File

@ -25,9 +25,9 @@ void sub_80A2598(s16, s16);
u32 sub_80A25AC(u16);
#if !defined(NONMATCHING) && defined(GROUND_SCRIPT_INCOMPLETE_DECLARATIONS)
// Workaround for ExecuteScriptCommand relying on s32 behavior of arguments
const DungeonInfo *sub_80A2608(s32 index);
const DungeonInfo *GetDungeonInfo_80A2608(s32 index);
#else
const DungeonInfo *sub_80A2608(s16 index);
const DungeonInfo *GetDungeonInfo_80A2608(s16 index);
#endif
const DungeonInfo *sub_80A2620(s16 index);
s16 sub_80A2654(s16 index);

2
include/dungeon_random.h
View File

@ -2,7 +2,7 @@
#define GUARD_DUNGEON_RANDOM_H
void sub_808408C(u32 param_1);
u32 sub_80840A4(void);
u32 YetAnotherRandom24(void);
void InitDungeonRNG(u32 value);
s32 DungeonRand16Bit(void);
s32 DungeonRandInt(s32 cap);

16
include/event_flag.h
View File

@ -8,17 +8,17 @@ struct UnkEventStruct
/* 0x4 */ u8 *unk4;
};
void sub_8001B88(s32 param_1,u32 *param_2,u32 *param_3);
void GetScriptVarScenario(s32 param_1,u32 *param_2,u32 *param_3);
void ScenarioCalc(s16 param_1, s32 param_2, s32 param_3);
bool8 sub_8001CC4(s16 param_1, u32 param_2, s32 param_3);
bool8 sub_8001D08(s16 param_1, u32 param_2, s32 param_3);
bool8 sub_8001D44(s16 param_1, u32 param_2, s32 param_3);
bool8 ScriptVarScenarioBefore(s16 param_1, u32 param_2, s32 param_3);
bool8 ScriptVarScenarioEqual(s16 param_1, u32 param_2, s32 param_3);
bool8 ScriptVarScenarioAfter(s16 param_1, u32 param_2, s32 param_3);
void sub_8001D88(void);
u32 _FlagCalc(s32 param_1, s32 param_2, u32 operation);
u8 _FlagJudge(s32 param_1, s32 param_2, u32 operation);
u32 FlagCalc(s32 r0, s32 r1, u32 operation);
void sub_800226C(u32 param_1, s16 param_2, s32 param_3, u32 operation);
void sub_80022A0(u32 param_1, s16 param_2, s16 param_3, u32 operation);
void UpdateScriptVarWithImmediate(u32 param_1, s16 param_2, s32 param_3, u32 operation);
void UpdateScriptVarWithVar(u32 param_1, s16 param_2, s16 param_3, u32 operation);
u8 FlagJudge(s32 r0, s32 r1, u32 operation);
u8 sub_80022F8(u32 param_1, s16 param_2, s32 param_3, u32 operation);
u8 sub_8002318(u32 param_1, s16 param_2, s16 param_3, u32 operation);
@ -33,7 +33,7 @@ void sub_8002758(s32 r0);
u8 sub_800276C(void);
// event_flag.s
extern void sub_80015C0(u32, u32);
extern u32 sub_8001658(u32, u32);
extern void ClearScriptVarArray(u32, u32);
extern u32 GetScriptVarValue(u32, u32);
#endif // GUARD_EVENT_FLAG_H

2
include/friend_area.h
View File

@ -37,7 +37,7 @@ u8 sub_80923D4(s32 target);
void sub_8092404(u8, u16 *, bool8, bool8);
void sub_809249C(u8 friendArea, bool8 clear);
void sub_8092558(u8 *buffer, u8 index);
void sub_8092578(u8 *buffer, u8 index, bool8 printPrice);
void WriteFriendAreaName(u8 *buffer, u8 index, bool8 printPrice);
void sub_8092638(u8 friendArea, unkStruct_8092638 *, bool8 checkLeader, bool8 checkDungeon);
void sub_80926F8(u8, unkStruct_8092638 *, u8);

2
include/ground_map.h
View File

@ -7,7 +7,7 @@ typedef struct unkStruct_3001B70
u8 fill0[0x55C - 0x0];
} unkStruct_3001B70;
extern unkStruct_3001B70 *gUnknown_3001B70;
extern unkStruct_3001B70 *gGroundMapDungeon_3001B70;
void GroundMap_Reset(void);

2
include/ground_map_1.h
View File

@ -5,7 +5,7 @@ void GroundMap_ExecuteEnter(s16);
void GroundMap_ExecuteEvent(s16 scriptIndex, u32);
void GroundMap_ExecuteStation(s16, s16, s8, u32);
bool8 sub_80A4D2C(s16);
bool8 GroundMapNotifyAll(s16);
bool8 sub_80A4D48(s16 index);
// ground_map_1.s

14
include/ground_script.h
View File

@ -140,14 +140,14 @@ extern FunctionScript gFunctionScriptTable[];
#include "debug.h"
void InitScriptData(ScriptData *a0);
u8 sub_809D8EC(Action *param_1, s16 param_2);
void sub_809D648(Action *action);
void sub_809D710(Action *param_1, ScriptInfoSmall *script, s16 index);
bool8 sub_809DA08(Action *param_1, s16 index, u32 param_3);
bool8 InitActionScriptData(Action *param_1, const DebugLocation *unused);
u8 GroundScriptCheckLockCondition(Action *param_1, s16 param_2);
void InitAction2(Action *action);
void GetFunctionScript(Action *param_1, ScriptInfoSmall *script, s16 index);
bool8 GroundScriptLockCond(Action *param_1, s16 index, u32 param_3);
bool8 ActionResetScriptData(Action *param_1, const DebugLocation *unused);
bool8 GroundScript_ExecutePP(Action *, s32 *, ScriptInfoSmall *, const DebugLocation *unused);
ScriptCommand *sub_80A242C(Action *action, s32 r1);
ScriptCommand *sub_80A2460(Action *action, s32 r1);
ScriptCommand *FindLabel(Action *action, s32 r1);
ScriptCommand *ResolveJump(Action *action, s32 r1);
void InitActionWithParams(Action *action, const CallbackData *callbacks, void *parent, s16 group, s8 sector);
#endif // GUARD_GROUND_SCRIPT_H

2
include/items.h
View File

@ -80,7 +80,7 @@ s32 SaveTeamInventory(u8 *, u32 size);
s32 sub_8090FEC(s32, u8 *strbuf, u8);
s32 WriteHighDecimal(s32, u8 *strbuf, u8);
u32 sub_80913E0(Item *slot, u32, struct subStruct_203B240 **);
// This macro doesn't do anything, it creates unused variables for the purpose of tricking the compiler and matching the asm.

2
include/pokemon.h
View File

@ -95,7 +95,7 @@ extern u32 sub_808D1DC(PokemonStruct1*);
extern PokemonStruct1 *sub_808D378(void);
extern PokemonStruct1 *sub_808D3BC(void);
extern PokemonStruct1 *sub_808D3F8(void);
extern s32 sub_808D544(u32);
extern s32 GetUnitSum_808D544(u32);
extern s32 sub_808D580(s32 *);
#endif // GUARD_POKEMON_H

8
include/sprite.h
View File

@ -84,9 +84,9 @@ void sub_8004E8C(unkStruct_2039DB0 *);
void sub_8005180(void);
void sub_8005304(void);
void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, u16 *, bool8);
void sub_80053AC(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8);
void sub_80053D0(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8);
void sub_800543C(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8);
void sub_80054BC(struct axPokemon *);
void AxResInitFile_80053AC(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, u32, bool8);
void AxResInit_80053D0(EntitySpriteInfo *, Dungeon_ax *, u32, u32, u32, u32, bool8);
void AxResInitUnorientedFile_800543C(EntitySpriteInfo *, OpenedFile *, u32, u32, u32, bool8);
void RunAxAnimationFrame_80054BC(struct axPokemon *);
#endif // GUARD_SPRITE_H

4
include/structs/struct_sub80095e4.h
View File

@ -39,7 +39,7 @@ typedef struct struct_Sub80095E4_2
(ptr).unk3C[(ptr).unk34].unk10 = a0 + 2; \
\
ResetUnusedInputStruct(); \
sub_800641C((ptr).unk3C, TRUE, TRUE); \
xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \
}
#define SUB_80095E4_CALL(ptr) \
@ -58,7 +58,7 @@ typedef struct struct_Sub80095E4_2
(ptr).unk3C[(ptr).unk34].unk10 = newE; \
\
ResetUnusedInputStruct(); \
sub_800641C((ptr).unk3C, TRUE, TRUE); \
xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE); \
}
// sub_802BF30 and sub_802C328 use a different function call, and 24 instead of 12

6
include/text1.h
View File

@ -5,14 +5,14 @@
extern UnkTextStruct1 gUnknown_2027370[4];
extern UnkTextStruct2 gUnknown_202AFC0[4];
extern u32 gUnknown_202B030;
extern u32 gTextShadowMask;
extern u16 gUnknown_202B038[4][32][32]; // dimensions unknown... but usage points to these dimensions
void LoadCharmaps(void);
void SelectCharmap(u32);
u32 xxx_update_some_bg_tiles(u32 a0);
u32 UpdateFadeInTile(u32 a0);
u32 sub_80063B0(void);
void sub_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2);
void xxx_call_save_unk_text_struct_800641C(UnkTextStruct2 *a0, bool8 a1, bool8 a2);
#endif // GUARD_TEXT1_H

4
include/text2.h
View File

@ -31,7 +31,7 @@ struct unkStruct_80B8848
u32 xxx_call_draw_char(s32, s32, u32, u32, u32);
void sub_8006518(UnkTextStruct2 *);
void RestoreUnkTextStruct_8006518(UnkTextStruct2 *);
void sub_8006554(UnkTextStruct1 *, u32 *, u32 *, u16 *, u32, const UnkTextStruct2 *, u8, u32, UnkTextStruct2_sub *, u8);
void sub_80073B8(s32);
void sub_80073E0(s32);
@ -47,7 +47,7 @@ extern void InitGraphics(void);
extern void sub_800836C(u32, u8 *, u32);
extern void sub_800898C(void);
extern void sub_80089AC(const UnkTextStruct2 *, UnkTextStruct2_sub *);
extern void sub_8008C54(u32);
extern void CallPrepareTextbox_8008C54(u32);
extern s32 sub_8008ED0(const u8 *);
extern void sub_8009388(void);
extern void PrintStringOnWindow(s32 x, u32 y, const u8 *str, u32 windowId, u32);

8
src/adventure_log.c
View File

@ -27,12 +27,12 @@ bool8 CreateAdventureLogScreen(u32 kind)
sAdventureLog = MemoryAlloc(sizeof(*sAdventureLog), 8);
sAdventureLog->s0.unk34 = kind;
sAdventureLog->s0.unk38 = &sAdventureLog->s0.unk3C[kind];
sub_8006518(sAdventureLog->s0.unk3C);
RestoreUnkTextStruct_8006518(sAdventureLog->s0.unk3C);
sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E2008;
sAdventureLog->s0.unk38->unk14 = &sAdventureLog->unk9C;
ResetUnusedInputStruct();
sub_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
sub_8013818(&sAdventureLog->s0.input, 0x20, 8, kind);
sub_8032084();
DisplayAdventureLog();
@ -68,7 +68,7 @@ void CleanAdventureLogScreen(void)
if (sAdventureLog != NULL) {
sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E1FF0;
ResetUnusedInputStruct();
sub_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
MemoryFree(sAdventureLog);
sAdventureLog = NULL;
}
@ -92,7 +92,7 @@ static void DisplayAdventureLog(void)
u8 temp;
s32 v1, v2, v3, v4, v5, v6;
sub_8008C54(sAdventureLog->s0.unk34);
CallPrepareTextbox_8008C54(sAdventureLog->s0.unk34);
sub_80073B8(sAdventureLog->s0.unk34);
r4 = sAdventureLog->s0.input.unk1E * 8;
r6 = r4;

2
src/adventure_log_menu.c
View File

@ -13,7 +13,7 @@ void CreateAdventureLogMenu(void)
void CleanAdventureLogMenu(void)
{
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
}
u32 UpdateAdventureLogMenu(void)

80
src/code.c
View File

@ -36,7 +36,7 @@ void nullsub_3(s32 a0, s32 a1)
/// TODO merge with event_flag
/////////////////////////////////
extern u8 gUnknown_2000A88[0x400];
extern u8 gScriptVarBuffer[0x400];
struct unkStruct_80B7394
{
@ -49,13 +49,13 @@ struct unkStruct_80B7394
u8 *text;
};
extern struct unkStruct_80B7394 gUnknown_80B7394[];
extern void sub_800199C(u32, s32, u32, s32);
extern void sub_80018D8(u32, u32, u32);
extern struct unkStruct_80B7394 gScriptVarInfo[];
extern void SetScriptVarArrayValue(u32, s32, u32, s32);
extern void SetScriptVarValue(u32, u32, u32);
extern void sub_80972F4(void);
extern void nullsub_128(void);
void sub_800135C(void)
void ThouroughlyResetScriptVars(void)
{
s32 iVar1;
s32 iVar3;
@ -64,19 +64,19 @@ void sub_800135C(void)
for(iVar3 = 0; iVar3 < 0x400; iVar3++)
{
gUnknown_2000A88[iVar3] = 0;
gScriptVarBuffer[iVar3] = 0;
}
for(iVar1 = 0; iVar1 < 0x51; iVar1 = (iVar1 + 1) * 0x10000 >> 0x10)
{
puVar1 = &gUnknown_80B7394[iVar1];
puVar1 = &gScriptVarInfo[iVar1];
if (((puVar1->unk0 != 0) && ((puVar1->unk0 != 8)))) {
for (uVar2 = 0; uVar2 < puVar1->unk8; uVar2++) {
sub_800199C(0, iVar1, uVar2, puVar1->unkA);
SetScriptVarArrayValue(0, iVar1, uVar2, puVar1->unkA);
}
}
}
sub_80015C0(0,1);
ClearScriptVarArray(0,1);
ScenarioCalc(2,0,0);
ScenarioCalc(3,0,0);
ScenarioCalc(4,0,0);
@ -88,37 +88,37 @@ void sub_800135C(void)
ScenarioCalc(10,0,0);
ScenarioCalc(0xb,0,0);
ScenarioCalc(0xc,0,0);
sub_80018D8(0,0xd,0xa2);
sub_80018D8(0,0xe,0);
sub_80018D8(0,0xf,0xa2);
sub_80018D8(0,0x10,-1);
sub_80018D8(0,0x11,0x24);
sub_80018D8(0,0x12,-1);
sub_80018D8(0,0x13,0);
sub_80018D8(0,0x14,-1);
sub_80018D8(0,0x16,0);
sub_80018D8(0,0x18,0);
sub_80018D8(0,0x19,0);
sub_80018D8(0,0x1b,-1);
sub_80018D8(0,0x1c,0);
sub_80018D8(0,0x1d,0);
sub_80018D8(0,0x1e,0);
sub_80018D8(0,0x1f,0);
sub_80015C0(0,0x24);
sub_80018D8(0,0x25,0);
sub_80018D8(0,0x26,0);
sub_80018D8(0,0x27,0);
sub_80018D8(0,0x28,0);
sub_80018D8(0,0x29,0);
sub_80018D8(0,0x2a,0);
sub_80015C0(0,0x2b);
sub_80015C0(0,0x2c);
sub_80015C0(0,0x2d);
sub_80015C0(0,0x2e);
sub_80015C0(0,0x2f);
sub_80015C0(0,0x30);
sub_80015C0(0,0x31);
sub_80015C0(0,0x41);
SetScriptVarValue(0,0xd,0xa2);
SetScriptVarValue(0,0xe,0);
SetScriptVarValue(0,0xf,0xa2);
SetScriptVarValue(0,0x10,-1);
SetScriptVarValue(0,0x11,0x24);
SetScriptVarValue(0,0x12,-1);
SetScriptVarValue(0,0x13,0);
SetScriptVarValue(0,0x14,-1);
SetScriptVarValue(0,0x16,0);
SetScriptVarValue(0,0x18,0);
SetScriptVarValue(0,0x19,0);
SetScriptVarValue(0,0x1b,-1);
SetScriptVarValue(0,0x1c,0);
SetScriptVarValue(0,0x1d,0);
SetScriptVarValue(0,0x1e,0);
SetScriptVarValue(0,0x1f,0);
ClearScriptVarArray(0,0x24);
SetScriptVarValue(0,0x25,0);
SetScriptVarValue(0,0x26,0);
SetScriptVarValue(0,0x27,0);
SetScriptVarValue(0,0x28,0);
SetScriptVarValue(0,0x29,0);
SetScriptVarValue(0,0x2a,0);
ClearScriptVarArray(0,0x2b);
ClearScriptVarArray(0,0x2c);
ClearScriptVarArray(0,0x2d);
ClearScriptVarArray(0,0x2e);
ClearScriptVarArray(0,0x2f);
ClearScriptVarArray(0,0x30);
ClearScriptVarArray(0,0x31);
ClearScriptVarArray(0,0x41);
sub_80972F4();
}

12
src/code_2.c
View File

@ -34,7 +34,7 @@
extern void NDS_LoadOverlay_GroundMain(void);
extern void sub_8014144(void);
extern void sub_800DAAC(void);
extern void sub_800135C(void);
extern void ThouroughlyResetScriptVars(void);
extern void xxx_script_related_8001334(u32);
extern void LoadTitleScreen(void);
extern void sub_80095CC(u32, u32);
@ -84,22 +84,22 @@ void GameLoop(void)
SetSavingIconCoords(NULL);
tmp = 0;
if (ReadSaveFromPak(&tmp))
sub_800135C();
ThouroughlyResetScriptVars();
xxx_script_related_8001334(14);
xxx_script_related_8001334(15);
sub_80015C0(0, 57);
ClearScriptVarArray(0, 57);
xxx_script_related_8001334(16);
if (sub_8001658(0, 57) == 0)
if (GetScriptVarValue(0, 57) == 0)
xxx_script_related_8001334(17);
while (1) {
gUnknown_203B03C = 0; // ???
sub_800A8F8(2);
ResetSprites(TRUE);
xxx_update_some_bg_tiles(0);
UpdateFadeInTile(0);
InitFontPalette();
sub_800CDA8(2);
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
gUnknown_2026E4E = 0x1000;
LoadTitleScreen();
SetBG2RegOffsets(0, 0);

2
src/code_800558C.c
View File

@ -40,7 +40,7 @@ void DoAxFrame_800558C(struct axPokemon *a0, s32 spriteX, s32 spriteY, u32 a3, u
return;
if (a0->axdata.sub1.poseId < 0)
sub_80054BC(a0);
RunAxAnimationFrame_80054BC(a0);
if (!(a0->axdata.flags >> 15))
return;

10
src/code_8009804.c
View File

@ -8,7 +8,7 @@
extern const u8 gUnknown_80B88CC[];
extern const struct FileArchive gSystemFileArchive; // 8300500
extern struct unkStruct_202D038 gUnknown_202D038[8];
extern struct unkStruct_202D038 gFontPalette[8];
extern u8 gUnknown_202D238[4];
extern s32 gUnknown_202D23C;
extern struct unkStruct_202D240 gUnknown_202D240[8];
@ -23,12 +23,12 @@ void InitFontPalette(void)
u32 *ptr;
fontpalFile = OpenFileAndGetFileDataPtr(gUnknown_80B88CC, &gSystemFileArchive); // fontpal
CpuCopy(gUnknown_202D038, fontpalFile->data, sizeof(gUnknown_202D038));
CpuCopy(gFontPalette, fontpalFile->data, sizeof(gFontPalette));
if (sub_80063B0() == 1)
ptr = &gUnknown_202D038[0].unk0[0];
ptr = &gFontPalette[0].unk0[0];
else
ptr = &gUnknown_202D038[1].unk0[0];
ptr = &gFontPalette[1].unk0[0];
for (i = 0; i < 16; ptr++, i++)
SetBGPaletteBufferColorArray(i + 240, (u8 *)ptr);
@ -131,7 +131,7 @@ void sub_80099F0(u32 a0)
s32 i;
for (i = 0; i < 8; i++)
gUnknown_202D038[i].unk0[1] = a0;
gFontPalette[i].unk0[1] = a0;
}
UNUSED static void sub_8009A10(u32 *a0)

2
src/code_80140DC.c
View File

@ -91,7 +91,7 @@ void sub_801416C(s32 param_1,s32 param_2)
gUnknown_202E73C = (param_2 < 0 ) ? 0 : param_2;
}
void sub_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4)
void xxx_info_box_80141B4(const u8 *text, u32 param_2, OpenedFile **file, u16 param_4)
{
sub_8014248(text, param_2, -1, NULL, NULL, 3, 0, file, param_4);
}

2
src/code_8015080.c
View File

@ -62,7 +62,7 @@ bool8 sub_8015080(u8 *buffer, const MenuItem *menuItems)
gUnknown_203B1F8->unk54[2] = gUnknown_80DAFA0;
sub_8012CAC(&gUnknown_203B1F8->unk54[2], menuItems);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B1F8->unk54, 1, 1);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B1F8->unk54, 1, 1);
sub_80073B8(0);
xxx_format_string(buffer, gUnknown_203B1F8->buffer, gUnknown_203B1F8->buffer + 0x400, 0);
PrintStringOnWindow(4, 4, gUnknown_203B1F8->buffer, 0, 0);

6
src/code_801602C.c
View File

@ -29,7 +29,7 @@ static void sub_801629C(void);
u32 CreateConfirmNameMenu(u32 mode, u8 *name)
{
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sUnknown_203B200 = MemoryAlloc(sizeof(struct unkStruct_203B200), 8);
sUnknown_203B200->unk0 = mode;
@ -113,10 +113,10 @@ static void sub_8016110(void)
break;
case CONFIRM_NAME_MENU_TOO_LONG:
sub_80141B4(sNameTooLong, 0, 0, 0x121);
xxx_info_box_80141B4(sNameTooLong, 0, 0, 0x121);
break;
case CONFIRM_NAME_MENU_EMPTY:
sub_80141B4(sEnterAName, 0, 0, 0x121);
xxx_info_box_80141B4(sEnterAName, 0, 0, 0x121);
break;
default:
break;

4
src/code_801AFA4.c
View File

@ -99,10 +99,10 @@ static void sub_801B080(void)
gTeamInventoryRef->teamItems[sUnknown_203B22C->teamItemIndex].id = ITEM_TM_USED_TM;
}
PlaySound(312);
sub_80141B4(sFmtLearnedTheMove, 0, 0, 0x121);
xxx_info_box_80141B4(sFmtLearnedTheMove, 0, 0, 0x121);
break;
case 3:
sub_80141B4(sFmtNoOneCanLearnThisMove, 0, 0, 0x121);
xxx_info_box_80141B4(sFmtNoOneCanLearnThisMove, 0, 0, 0x121);
break;
default:
case 4:

6
src/code_801B3C0.c
View File

@ -31,7 +31,7 @@ bool8 sub_801B3C0(Item *item)
sUnknown_203B230->unk24 = 0;
sub_80140B4(sUnknown_203B230->unk28);
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B230->unk28, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B230->unk28, TRUE, TRUE);
sub_801B46C(0);
return TRUE;
}
@ -75,12 +75,12 @@ static void sub_801B480(void)
switch (sUnknown_203B230->state) {
case 0:
sub_8008C54(sUnknown_203B230->unk24);
CallPrepareTextbox_8008C54(sUnknown_203B230->unk24);
sUnknown_203B230->unkC = sub_80913E0(&sUnknown_203B230->item, sUnknown_203B230->unk24, sUnknown_203B230->unk10);
sUnknown_203B230->unk20 = 0;
break;
case 1:
sub_8008C54(sUnknown_203B230->unk24);
CallPrepareTextbox_8008C54(sUnknown_203B230->unk24);
sub_80073B8(sUnknown_203B230->unk24);
preload = sUnknown_203B230->unk10[sUnknown_203B230->unk8];
strcpy(gAvailablePokemonNames, preload->pokeName);

48
src/code_801B60C.c
View File

@ -16,7 +16,7 @@
#include "text1.h"
#include "text2.h"
extern u8 gUnknown_202DE58[];
extern u8 gFormatItems[];
extern u8 gUnknown_202DEA8[];
extern u8 gAvailablePokemonNames[]; // 202DF98
@ -25,8 +25,8 @@ static EWRAM_DATA_2 unkStruct_203B234 *sUnknown_203B234 = {0};
#include "data/code_801B60C.h" // 80DBA58
// event_flag.s
extern u32 sub_8001784(u32, u32, u16);
extern void sub_800199C(u32, u32, u32, u32);
extern u32 GetScriptVarArrayValue(u32, u32, u16);
extern void SetScriptVarArrayValue(u32, u32, u32, u32);
static void sub_801B748(u32);
static void sub_801B760(void);
@ -63,7 +63,7 @@ bool8 sub_801B60C(u32 r0, u8 id, u8 quantity)
sUnknown_203B234->unk14.unk4 = 0;
sUnknown_203B234->unk14.unk8 = 1;
PrintColoredPokeNameToBuffer(gAvailablePokemonNames, GetPlayerPokemonStruct(), COLOR_YELLOW);
sub_8090E14(gUnknown_202DE58, &sUnknown_203B234->unk10, &sUnknown_203B234->unk14);
sub_8090E14(gFormatItems, &sUnknown_203B234->unk10, &sUnknown_203B234->unk14);
sub_801B748(0);
return TRUE;
}
@ -132,26 +132,26 @@ static void sub_801B760(void)
case 13:
case 14:
case 15:
sub_8006518(sUnknown_203B234->unkF4);
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
for (i = 0; i < 4; i++)
sUnknown_203B234->unkF4[i] = sUnknown_80DBA58;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 10:
sub_8006518(sUnknown_203B234->unkF4);
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
sub_801BB5C();
sUnknown_203B234->unkF4[2] = sUnknown_80DBA70;
sub_8012CAC(&sUnknown_203B234->unkF4[2], sUnknown_203B234->unkCC);
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
break;
case 12:
sub_8006518(sUnknown_203B234->unkF4);
RestoreUnkTextStruct_8006518(sUnknown_203B234->unkF4);
sUnknown_203B234->unkF4[1] = sUnknown_80DBA88;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B234->unkF4, TRUE, TRUE);
break;
}
}
@ -163,24 +163,24 @@ static void sub_801B874(void)
if (sUnknown_203B234->unk10.id == ITEM_WEAVILE_FIG) {
sUnknown_203B234->fallbackState = 16;
if (sub_8001784(0, 71, 1)) {
if (GetScriptVarArrayValue(0, 71, 1)) {
AddToTeamMoney(1000);
sub_801B748(4);
}
else {
sub_800199C(0, 71, 1, 1);
SetScriptVarArrayValue(0, 71, 1, 1);
sub_801B748(3);
}
}
else if (sUnknown_203B234->unk10.id == ITEM_MIME_JR_FIG) {
sUnknown_203B234->fallbackState = 16;
if (sub_8001784(0, 71, 0)) {
if (GetScriptVarArrayValue(0, 71, 0)) {
AddToTeamMoney(1000);
sub_801B748(4);
}
else {
sub_800199C(0, 71, 0, 1);
SetScriptVarArrayValue(0, 71, 0, 1);
sub_801B748(3);
}
}
@ -214,24 +214,24 @@ store:
}
break;
case 1:
if (sub_808D544(0) < 2)
sub_80141B4(sFmtReceivedThePromised, 0, 0, 0x101);
if (GetUnitSum_808D544(0) < 2)
xxx_info_box_80141B4(sFmtReceivedThePromised, 0, 0, 0x101);
else
sub_80141B4(sFmtTeamReceivedThePromised, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtTeamReceivedThePromised, 0, 0, 0x101);
break;
case 2:
sub_80141B4(sFmtTeamAlsoReceived, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtTeamAlsoReceived, 0, 0, 0x101);
break;
case 3:
PlaySound(212);
sub_80141B4(sFmtReceivedStatue, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtReceivedStatue, 0, 0, 0x101);
break;
case 4:
sub_80141B4(sFmtReceive1000Instead, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtReceive1000Instead, 0, 0, 0x101);
break;
case 5:
sUnknown_203B234->fallbackState = 16;
sub_80141B4(sFmtFullSoSentToStorage, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtFullSoSentToStorage, 0, 0, 0x101);
break;
case 6:
sub_801BB20();
@ -262,15 +262,15 @@ store:
break;
case 13:
sUnknown_203B234->fallbackState = 16;
sub_80141B4(sFmtThrownAway, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtThrownAway, 0, 0, 0x101);
break;
case 14:
sUnknown_203B234->fallbackState = 16;
sub_80141B4(sFmtPutInStorageForReceive, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtPutInStorageForReceive, 0, 0, 0x101);
break;
case 15:
sUnknown_203B234->fallbackState = 16;
sub_80141B4(sFmtDiscardedForReceive, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtDiscardedForReceive, 0, 0, 0x101);
break;
case 16:
break;

10
src/code_801C8C4.c
View File

@ -31,7 +31,7 @@ bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3)
sub_801CF94();
sUnknown_203B244->unk4B4.s0.unk34 = a1;
sUnknown_203B244->unk4B4.s0.unk38 = &sUnknown_203B244->unk4B4.s0.unk3C[a1];
sub_8006518(sUnknown_203B244->unk4B4.s0.unk3C);
RestoreUnkTextStruct_8006518(sUnknown_203B244->unk4B4.s0.unk3C);
sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE54;
sUnknown_203B244->unk4B4.s0.unk38->unk14 = &sUnknown_203B244->unk4B4.unk9C;
@ -40,7 +40,7 @@ bool8 sub_801C8C4(s32 a0, s32 a1, UnkTextStruct2_sub *a2, u32 a3)
sub_8012D08(sUnknown_203B244->unk4B4.s0.unk38, a3);
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B244->unk4B4.s0.input, sub_801CE58(), a3, a1);
if (sUnknown_203B248 == sUnknown_203B244->unk0) {
@ -112,7 +112,7 @@ u8 sub_801CB24(void)
void sub_801CB5C(bool8 a0)
{
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, FALSE, FALSE);
sUnknown_203B244->unk4B4.s0.input.unk22 = sub_801CE58();
sub_8013984(&sUnknown_203B244->unk4B4.s0.input);
sub_801CC38();
@ -130,7 +130,7 @@ void sub_801CBB8(void)
sUnknown_203B24E = sUnknown_203B244->unk4B4.s0.input.unk1E;
sUnknown_203B244->unk4B4.s0.unk3C[sUnknown_203B244->unk4B4.s0.unk34] = sUnknown_80DBE3C;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B244->unk4B4.s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B244);
sUnknown_203B244 = NULL;
}
@ -154,7 +154,7 @@ void sub_801CCD8(void)
s32 index;
u8 buffer[80];
sub_8008C54(sUnknown_203B244->unk4B4.s0.unk34);
CallPrepareTextbox_8008C54(sUnknown_203B244->unk4B4.s0.unk34);
sub_80073B8(sUnknown_203B244->unk4B4.s0.unk34);
PrintStringOnWindow(10, 0, sStorage, sUnknown_203B244->unk4B4.s0.unk34, 0);
sub_8012BC4(sUnknown_203B244->unk4B4.unk9C.f2 * 8 + 4, 0, sUnknown_203B244->unk4B4.s0.input.unk1E + 1, 2, 7, sUnknown_203B244->unk4B4.s0.unk34);

10
src/code_801D014.c
View File

@ -64,7 +64,7 @@ bool8 sub_801D014(PokemonStruct1 *a0)
struct unk_203B250 *preload;
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sUnknown_203B250 = MemoryAlloc(sizeof(struct unk_203B250), 8);
sUnknown_203B250->menuAction = sUnknown_203B254;
@ -191,7 +191,7 @@ static void sub_801D220(void)
{
s32 i;
sub_8006518(sUnknown_203B250->unkB8);
RestoreUnkTextStruct_8006518(sUnknown_203B250->unkB8);
switch (sUnknown_203B250->state) {
case 0:
@ -239,7 +239,7 @@ static void sub_801D220(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B250->unkB8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B250->unkB8, TRUE, TRUE);
}
static void sub_801D3A8(void)
@ -584,11 +584,11 @@ static void sub_801D894(void)
xxx_format_string(location, buffer, (u8 *)(&preload_string + 1), 0);
location_length = sub_8008ED0(buffer);
x_coord = (128 - location_length) / 2; // Centers the location name
sub_8008C54(1);
CallPrepareTextbox_8008C54(1);
sub_80073B8(1);
PrintStringOnWindow(x_coord, 4, buffer, 1, 0);
sub_80073E0(1);
sub_8008C54(2);
CallPrepareTextbox_8008C54(2);
sub_80073B8(2);
LoadTeamRankBadge(2, 8, 6);

10
src/code_801D9E4.c
View File

@ -25,11 +25,11 @@ bool8 sub_801D9E4(void)
sUnknown_203B258 = MemoryAlloc(sizeof(*sUnknown_203B258), 8);
sUnknown_203B258->s0.unk34 = 3;
sUnknown_203B258->s0.unk38 = &sUnknown_203B258->s0.unk3C[3];
sub_8006518(sUnknown_203B258->s0.unk3C);
RestoreUnkTextStruct_8006518(sUnknown_203B258->s0.unk3C);
sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF88;
sUnknown_203B258->s0.unk38->unk14 = &sUnknown_203B258->unk9C;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
sub_8013818(&sUnknown_203B258->s0.input, 229, 10, sUnknown_203B258->s0.unk34);
sub_801DB54();
sub_801DBD4();
@ -83,7 +83,7 @@ void sub_801DB0C(void)
if (sUnknown_203B258 != NULL) {
sUnknown_203B258->s0.unk3C[sUnknown_203B258->s0.unk34] = sUnknown_80DBF70;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
MemoryFree(sUnknown_203B258);
sUnknown_203B258 = NULL;
}
@ -97,7 +97,7 @@ static void sub_801DB54(void)
sUnknown_203B258->unk9C.f3 = 0;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B258->s0.unk3C, TRUE, TRUE);
SUB_80095E4_CALL(sUnknown_203B258->s0);
}
@ -110,7 +110,7 @@ static void sub_801DBD4(void)
s16 index;
int counter;
sub_8008C54(sUnknown_203B258->s0.unk34);
CallPrepareTextbox_8008C54(sUnknown_203B258->s0.unk34);
sub_80073B8(sUnknown_203B258->s0.unk34);
PrintStringOnWindow(10, 0, sField, sUnknown_203B258->s0.unk34, 0); // Field

8
src/code_801EE10.c
View File

@ -85,7 +85,7 @@ u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *tex
if (iVar8 < four) {
iVar8 = 4;
}
sub_8006518(gUnknown_203B270->unk58);
RestoreUnkTextStruct_8006518(gUnknown_203B270->unk58);
gUnknown_203B270->unk50 = param_6;
gUnknown_203B270->unk58[param_6] = gUnknown_80DC25C;
if (gUnknown_203B270->text != NULL) {
@ -94,7 +94,7 @@ u8 sub_801EE10(u32 param_1, s16 species, Move *moves, u32 param_4, const u8 *tex
}
sub_8012D08(&gUnknown_203B270->unk58[gUnknown_203B270->unk50],iVar8);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
sub_8013818(&gUnknown_203B270->input,iVar5,iVar5,param_6);
sub_8013780(&gUnknown_203B270->input,0);
sub_801F280(1);
@ -251,7 +251,7 @@ void sub_801F1B0(bool8 param_1, bool8 param_2)
if(!gUnknown_203B270->unk4)
gUnknown_203B270->unk4 = param_2;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
gUnknown_203B270->input.unk22 = sub_801F3F8();
sub_8013984(&gUnknown_203B270->input);
gUnknown_203B270->input.menuIndex = sub_8092F4C(gUnknown_203B270->moves, gUnknown_203B270->input.menuIndex);
@ -270,7 +270,7 @@ void sub_801F214(void)
gUnknown_203B270->unk58[gUnknown_203B270->unk54] = gUnknown_80DC240;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B270->unk58, TRUE, TRUE);
MemoryFree(gUnknown_203B270);
gUnknown_203B270 = NULL;
}

10
src/code_801F428.c
View File

@ -56,7 +56,7 @@ bool8 sub_801F428(s16 index, s32 param_2)
gUnknown_203B274->unk4 = &gUnknown_203B274->unk8;
gUnknown_203B274->s348.s0.unk34 = param_2;
gUnknown_203B274->s348.s0.unk38 = &gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34];
sub_8006518(gUnknown_203B274->s348.s0.unk3C);
RestoreUnkTextStruct_8006518(gUnknown_203B274->s348.s0.unk3C);
gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2C4;
gUnknown_203B274->s348.s0.unk38->unk14 = &gUnknown_203B274->s348.unk9C;
gUnknown_203B274->s348.unk9C.f0 = 1;
@ -64,7 +64,7 @@ bool8 sub_801F428(s16 index, s32 param_2)
gUnknown_203B274->s348.unk9C.f2 = 0xC;
gUnknown_203B274->s348.unk9C.f3 = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_203B274->s348.s0.input, sub_801F7E4(), 4, param_2);
sub_801F690();
sub_801F700();
@ -111,7 +111,7 @@ u16 sub_801F5B4(void)
void sub_801F5F0(bool8 r0)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_203B274->s348.s0.input);
sub_801F690();
sub_801F700();
@ -125,7 +125,7 @@ void sub_801F63C(void)
{
gUnknown_203B274->s348.s0.unk3C[gUnknown_203B274->s348.s0.unk34] = sUnknown_80DC2AC;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B274->s348.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_203B274);
gUnknown_203B274 = NULL;
}
@ -143,7 +143,7 @@ void sub_801F700(void)
u8 buffer2 [48];
u8 buffer1 [128];
sub_8008C54(gUnknown_203B274->s348.s0.unk34);
CallPrepareTextbox_8008C54(gUnknown_203B274->s348.s0.unk34);
sub_80073B8(gUnknown_203B274->s348.s0.unk34);
sprintfStatic(buffer1,gUnknown_80DC2DC,gUnknown_203B274->s348.s0.input.unk1E + 1,gUnknown_203B274->s348.s0.input.unk20); // Moves Page: %d/%d
PrintStringOnWindow(0x10,0,buffer1,gUnknown_203B274->s348.s0.unk34,0);

12
src/code_801F808.c
View File

@ -61,7 +61,7 @@ bool8 sub_801F808(u16 *moveIDs)
gUnknown_203B278->unk60 = gUnknown_203B278->unk64;
sub_80140B4(gUnknown_203B278->unk64);
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
gUnknown_203B278->moveIDs = moveIDs;
for(index = 4; index > 1; index--)
@ -98,7 +98,7 @@ void sub_801F8D0(void)
{
gUnknown_203B278->unk64[gUnknown_203B278->unk5C] = sUnknown_80DC2F8;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
MemoryFree(gUnknown_203B278);
gUnknown_203B278 = NULL;
}
@ -123,11 +123,11 @@ void sub_801F930(void)
gUnknown_203B278->unkC4.f2 = 0x10;
gUnknown_203B278->unkC4.f3 = 0;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
break;
case 1:
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B278->unk64, TRUE, TRUE);
break;
default:
break;
@ -140,13 +140,13 @@ void sub_801F9A4(void)
switch (gUnknown_203B278->state) {
case 0:
sub_8008C54(gUnknown_203B278->unk5C);
CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C);
gUnknown_203B278->selectedMoveID = gUnknown_203B278->moveIDs[gUnknown_203B278->unk28.unk1E];
gUnknown_203B278->unk10 = unk_MoveIDPrintMoveDescription(gUnknown_203B278->unk28.unk1E,gUnknown_203B278->selectedMoveID,gUnknown_203B278->unk5C,gUnknown_203B278->unk14);
gUnknown_203B278->unk24 = 0;
break;
case 1:
sub_8008C54(gUnknown_203B278->unk5C);
CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C);
sub_80073B8(gUnknown_203B278->unk5C);
name = &(gUnknown_203B278->unk14[gUnknown_203B278->unkC]->pokeName);
strcpy(gAvailablePokemonNames, *name);

40
src/code_80227B8.c
View File

@ -17,7 +17,7 @@
#include "text2.h"
extern u8 gUnknown_202DEA8[];
extern u8 gUnknown_202DE58[];
extern u8 gFormatItems[];
extern u8 gAvailablePokemonNames[]; // 202DF98
static EWRAM_DATA_2 unkStruct_203B294 *sUnknown_203B294 = {0};
@ -38,7 +38,7 @@ static void sub_8023120(void);
bool8 sub_80227B8(PokemonStruct1 *pkmn)
{
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sUnknown_203B294 = MemoryAlloc(sizeof(unkStruct_203B294), 8);
sUnknown_203B294->menuAction = 0;
@ -113,7 +113,7 @@ static void sub_802293C(void)
{
s32 i;
sub_8006518(sUnknown_203B294->unk148);
RestoreUnkTextStruct_8006518(sUnknown_203B294->unk148);
switch (sUnknown_203B294->state) {
case 2:
@ -134,7 +134,7 @@ static void sub_802293C(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B294->unk148, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B294->unk148, TRUE, TRUE);
}
static void sub_8022A10(void)
@ -166,19 +166,19 @@ static void sub_8022A10(void)
sub_801B3C0(&sUnknown_203B294->item);
break;
case 5:
sub_80141B4(sDoesNotAppearHungry, 0, 0, 0x301);
xxx_info_box_80141B4(sDoesNotAppearHungry, 0, 0, 0x301);
break;
case 6:
sub_80141B4(sFmtGummiBigFav, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtGummiBigFav, 0, 0, 0x101);
break;
case 7:
sub_80141B4(sFmtGummiFav, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtGummiFav, 0, 0, 0x101);
break;
case 8:
sub_80141B4(sFmtGummiOkay, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtGummiOkay, 0, 0, 0x101);
break;
case 9:
sub_80141B4(sFmtGummiSatisfied, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtGummiSatisfied, 0, 0, 0x101);
break;
case 10:
do {
@ -203,7 +203,7 @@ static void sub_8022A10(void)
sUnknown_203B294->fallbackState = 10;
strcpy(gUnknown_202DEA8, GetIQSkillName(sUnknown_203B294->unk40));
PlaySound(203);
sub_80141B4(sFmtIQHelpedLearn, 0, 0, 0x101);
xxx_info_box_80141B4(sFmtIQHelpedLearn, 0, 0, 0x101);
sUnknown_203B294->unk40++;
break;
}
@ -238,35 +238,35 @@ static void sub_8022A10(void)
}
break;
case 12:
sub_80141B4(sFmtPlusEverything, 0, 0, 0x301);
xxx_info_box_80141B4(sFmtPlusEverything, 0, 0, 0x301);
break;
case 13:
sub_80141B4(sFmtPlusAtk, 0, 0, 0x301);
xxx_info_box_80141B4(sFmtPlusAtk, 0, 0, 0x301);
break;
case 14:
sub_80141B4(sFmtPlusSpAtk, 0, 0, 0x301);
xxx_info_box_80141B4(sFmtPlusSpAtk, 0, 0, 0x301);
break;
case 15:
sub_80141B4(sFmtPlusDef, 0, 0, 0x301);
xxx_info_box_80141B4(sFmtPlusDef, 0, 0, 0x301);
break;
case 16:
sub_80141B4(sFmtPlusSpDef, 0, 0, 0x301);
xxx_info_box_80141B4(sFmtPlusSpDef, 0, 0, 0x301);
break;
case 17:
sUnknown_203B294->fallbackState = 22;
sub_80141B4(sNoGummis, 0, 0, 0x301);
xxx_info_box_80141B4(sNoGummis, 0, 0, 0x301);
break;
case 18:
sUnknown_203B294->fallbackState = 22;
sub_80141B4(sNoItem, 0, 0, 0x301);
xxx_info_box_80141B4(sNoItem, 0, 0, 0x301);
break;
case 19:
sUnknown_203B294->fallbackState = 22;
sub_80141B4(sGummiGone, 0, 0, 0x301);
xxx_info_box_80141B4(sGummiGone, 0, 0, 0x301);
break;
case 20:
sUnknown_203B294->fallbackState = 22;
sub_80141B4(sItemGone, 0, 0, 0x301);
xxx_info_box_80141B4(sItemGone, 0, 0, 0x301);
break;
case 21:
sub_801AFA4(sUnknown_203B294->itemIndex);
@ -375,7 +375,7 @@ static void sub_8022EF4(void)
sUnknown_203B294->unk40 = 1;
boostAmount = sUnknown_203B294->gummi.boostAmount;
sub_8090E14(gUnknown_202DE58, &gTeamInventoryRef->teamItems[sUnknown_203B294->itemIndex], NULL);
sub_8090E14(gFormatItems, &gTeamInventoryRef->teamItems[sUnknown_203B294->itemIndex], NULL);
if (boostAmount != -1)
ShiftItemsDownFrom(sUnknown_203B294->itemIndex);

10
src/code_8023144.c
View File

@ -45,7 +45,7 @@ bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3)
gUnknown_3001B5C->s35C.s0.unk34 = index;
gUnknown_3001B5C->s35C.s0.unk38 = &gUnknown_3001B5C->s35C.s0.unk3C[index];
sub_8006518(gUnknown_3001B5C->s35C.s0.unk3C);
RestoreUnkTextStruct_8006518(gUnknown_3001B5C->s35C.s0.unk3C);
gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC91C;
gUnknown_3001B5C->s35C.s0.unk38->unk14 = &gUnknown_3001B5C->s35C.unk9C;
@ -55,7 +55,7 @@ bool8 sub_8023144(s32 a0, s32 index, UnkTextStruct2_sub *sub, u32 a3)
sub_8012D08(gUnknown_3001B5C->s35C.s0.unk38, a3);
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
sub_8013818(&gUnknown_3001B5C->s35C.s0.input, sub_80236A4(), a3, index);
gUnknown_3001B5C->s35C.s0.input.menuIndex = gUnknown_203B29C;
gUnknown_3001B5C->s35C.s0.input.unk1E = gUnknown_203B29E;
@ -109,7 +109,7 @@ s16 sub_802331C(void)
void sub_8023354(bool8 cursorSprite)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE);
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, FALSE, FALSE);
sub_8013984(&gUnknown_3001B5C->s35C.s0.input);
sub_8023420();
sub_80234BC();
@ -126,7 +126,7 @@ void sub_80233A0(void)
gUnknown_203B29E = gUnknown_3001B5C->s35C.s0.input.unk1E;
gUnknown_3001B5C->s35C.s0.unk3C[gUnknown_3001B5C->s35C.s0.unk34] = sUnknown_80DC904;
ResetUnusedInputStruct();
sub_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_3001B5C->s35C.s0.unk3C, TRUE, TRUE);
MemoryFree(gUnknown_3001B5C);
gUnknown_3001B5C = NULL;
}
@ -155,7 +155,7 @@ static void sub_80234BC(void)
u8 buffer1[100];
unkStruct_8092638 auStack_2c;
sub_8008C54(gUnknown_3001B5C->s35C.s0.unk34);
CallPrepareTextbox_8008C54(gUnknown_3001B5C->s35C.s0.unk34);
sub_80073B8(gUnknown_3001B5C->s35C.s0.unk34);
PrintStringOnWindow(10, 0, sPokemon, gUnknown_3001B5C->s35C.s0.unk34, 0);

6
src/code_8024458.c
View File

@ -28,7 +28,7 @@ bool8 sub_8024458(s16 speciesNum, s32 a1)
sUnknown_203B2AC->speciesNum = speciesNum_s32;
sUnknown_203B2AC->unkE0 = a1;
sUnknown_203B2AC->unkE4 = &sUnknown_203B2AC->unkE8[a1];
sub_8006518(sUnknown_203B2AC->unkE8);
RestoreUnkTextStruct_8006518(sUnknown_203B2AC->unkE8);
sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9C8;
sUnknown_203B2AC->unkE4->unk14 = &sUnknown_203B2AC->unk148;
sUnknown_203B2AC->unk148.f2 = 10;
@ -67,7 +67,7 @@ void sub_802453C(void)
if (sUnknown_203B2AC != NULL) {
sUnknown_203B2AC->unkE8[sUnknown_203B2AC->unkE0] = sUnknown_80DC9B0;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
MemoryFree(sUnknown_203B2AC);
sUnknown_203B2AC = NULL;
}
@ -79,7 +79,7 @@ static void sub_8024588(void)
sUnknown_203B2AC->unk148.f1 = sUnknown_203B2AC->input.unk1E;
sUnknown_203B2AC->unk148.f3 = 0;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2AC->unkE8, TRUE, TRUE);
}
static void sub_80245D0(void)

20
src/code_802DB28.c
View File

@ -13,7 +13,7 @@
#include "text1.h"
#include "text2.h"
extern u8 gUnknown_202DE58[];
extern u8 gFormatItems[];
extern u8 gUnknown_202E1C8[];
extern u8 gUnknown_202E5D8[];
@ -37,7 +37,7 @@ bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon)
return FALSE;
ResetUnusedInputStruct();
sub_800641C(NULL, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
sUnknown_203B2FC = MemoryAlloc(sizeof(struct unkStruct_203B2FC), 8);
sUnknown_203B2FC->jobSlotIndex = jobSlotIndex;
@ -97,7 +97,7 @@ static void sub_802DC40(void)
{
s32 i;
sub_8006518(sUnknown_203B2FC->unk48);
RestoreUnkTextStruct_8006518(sUnknown_203B2FC->unk48);
switch (sUnknown_203B2FC->state) {
case 0:
@ -108,7 +108,7 @@ static void sub_802DC40(void)
}
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B2FC->unk48, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B2FC->unk48, TRUE, TRUE);
}
static void sub_802DC9C(void)
@ -125,7 +125,7 @@ static void sub_802DC9C(void)
speciesText = GetMonSpecies(sUnknown_203B2FC->jobInfo->targetSpecies);
strcpy(gUnknown_202E1C8 - 480, speciesText);
UnlockExclusivePokemon(sUnknown_203B2FC->jobInfo->clientSpecies);
BufferItemName(gUnknown_202DE58, sUnknown_203B2FC->jobInfo->targetItem, NULL);
BufferItemName(gFormatItems, sUnknown_203B2FC->jobInfo->targetItem, NULL);
sUnknown_203B2FC->fallbackState = 6;
switch (sUnknown_203B2FC->jobInfo->missionType) {
@ -150,16 +150,16 @@ static void sub_802DC9C(void)
}
break;
case 1:
sub_80141B4(sThanksForRescuingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D);
xxx_info_box_80141B4(sThanksForRescuingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D);
break;
case 2:
sub_80141B4(sThanksForRescuingThem, 0, &sUnknown_203B2FC->faceFile, 0x10D);
xxx_info_box_80141B4(sThanksForRescuingThem, 0, &sUnknown_203B2FC->faceFile, 0x10D);
break;
case 3:
sub_80141B4(sThanksForEscortingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D);
xxx_info_box_80141B4(sThanksForEscortingMe, 0, &sUnknown_203B2FC->faceFile, 0x10D);
break;
case 5:
sub_80141B4(sThanksForDelivering, 0, &sUnknown_203B2FC->faceFile, 0x10D);
xxx_info_box_80141B4(sThanksForDelivering, 0, &sUnknown_203B2FC->faceFile, 0x10D);
break;
case 4:
index = FindItemInInventory(sUnknown_203B2FC->jobInfo->targetItem);
@ -167,7 +167,7 @@ static void sub_802DC9C(void)
ShiftItemsDownFrom(index);
FillInventoryGaps();
}
sub_80141B4(sThanksForGetting, 0, &sUnknown_203B2FC->faceFile, 0x10D);
xxx_info_box_80141B4(sThanksForGetting, 0, &sUnknown_203B2FC->faceFile, 0x10D);
break;
case 6:
sub_802F204(&sUnknown_203B2FC->unk8, 1);

6
src/code_802DE84.c
View File

@ -24,7 +24,7 @@ bool8 sub_802DE84(unkStruct_802C39C *mail)
sub_801317C(&sUnknown_203B300->unk0);
sUnknown_203B300->unk10 = sUnknown_203B300->mail->unk0[0];
sUnknown_203B300->unk14 = &sUnknown_203B300->unk18[sUnknown_203B300->unk10];
sub_8006518(sUnknown_203B300->unk18);
RestoreUnkTextStruct_8006518(sUnknown_203B300->unk18);
sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0264;
sub_802DF14();
return TRUE;
@ -55,7 +55,7 @@ void sub_802DF24(void)
if (sUnknown_203B300 != NULL) {
sUnknown_203B300->unk18[sUnknown_203B300->unk10] = sUnknown_80E0248;
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
MemoryFree(sUnknown_203B300);
sUnknown_203B300 = NULL;
}
@ -64,7 +64,7 @@ void sub_802DF24(void)
static void sub_802DF6C(void)
{
ResetUnusedInputStruct();
sub_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(sUnknown_203B300->unk18, TRUE, TRUE);
}
static void sub_802DF88(void)

6
src/code_8031D70.c
View File

@ -60,7 +60,7 @@ bool8 sub_8031D70(u32 mailIndex, s32 param_2)
sub_801317C(&gUnknown_203B334->unk4);
gUnknown_203B334->unk10 = param_2;
gUnknown_203B334->unk14 = &gUnknown_203B334->unk18[param_2];
sub_8006518(gUnknown_203B334->unk18);
RestoreUnkTextStruct_8006518(gUnknown_203B334->unk18);
gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FC4;
sub_8031E00();
return TRUE;
@ -93,7 +93,7 @@ void sub_8031E10(void)
{
gUnknown_203B334->unk18[gUnknown_203B334->unk10] = gUnknown_80E1FA8;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
MemoryFree(gUnknown_203B334);
gUnknown_203B334 = NULL;
}
@ -102,7 +102,7 @@ void sub_8031E10(void)
void sub_8031E58(void)
{
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
xxx_call_save_unk_text_struct_800641C(gUnknown_203B334->unk18, TRUE, TRUE);
}
void DrawSOSPasswordScreen(void)

26
src/code_8048480.c
View File

@ -26,7 +26,7 @@
#include "structs/str_position.h"
extern u8 gAvailablePokemonNames[];
extern u8 gUnknown_202DE58[];
extern u8 gFormatItems[];
extern s16 gTypeGummiIQBoost[NUM_TYPES][NUMBER_OF_GUMMIS];
@ -60,7 +60,7 @@ extern s16 gUnknown_80F4E74[];
extern u8 *gUnknown_80FDBB8[];
extern u8 *gUnknown_80FE458[];
extern u8 *gUnknown_80FE3E8[];
extern u8 *gItemStickyDoesntWorkText[];
extern u8 *gUnknown_80FEAE8[];
extern u8 *gUnknown_80FDBA0[];
extern u8 *gUnknown_80FE434[];
@ -73,16 +73,16 @@ extern u8 *gUnknown_80FD644[];
extern u8 *gUnknown_80FD648[];
extern u8 *gUnknown_80FD6E8[];
extern u8 *gPtrCantUseInDungeonMessage[];
extern u8 *gUnknown_80FE3E8[];
extern u8 *gItemStickyDoesntWorkText[];
extern u8 *gPtrMusicBoxPlayedCrumbledMessage[];
extern u8 *gPtrWishStoneCrumbledMessage[];
extern u8 *gPtrIcePartCrumbledMessage[];
extern u8 *gPtrRockPartCrumbledMessage[];
extern u8 *gPtrSteelPartCrumbledMessage[];
extern u8 *gUnknown_80FDCA4[];
extern u8 *gUnknown_80FE3E8[];
extern u8 *gItemStickyDoesntWorkText[];
extern u8 *gUnknown_80FECA0[];
extern u8 *gUnknown_80FE3E8[];
extern u8 *gItemStickyDoesntWorkText[];
extern u8 *gUnknown_80F9BD8[];
#include "data/code_8048480.h"
@ -226,7 +226,7 @@ void sub_80479B8(char param_1, char param_2, u8 param_3, Entity *pokemon, Entity
return;
}
PlaySoundEffect(0x14d);
sub_8045BF8(gUnknown_202DE58,item);
sub_8045BF8(gFormatItems,item);
SetMessageArgument(gAvailablePokemonNames,target,0);
sub_80522F4(pokemon,target,*gUnknown_80FDBB8); // $m0 caught the $i0
info->heldItem = *item;
@ -240,8 +240,8 @@ void sub_80479B8(char param_1, char param_2, u8 param_3, Entity *pokemon, Entity
}
}
if ((item->flags & ITEM_FLAG_STICKY)) {
sub_8045BF8(gUnknown_202DE58,item);
sub_80522F4(pokemon,target,*gUnknown_80FE3E8);
sub_8045BF8(gFormatItems,item);
sub_80522F4(pokemon,target,*gItemStickyDoesntWorkText);
if (param_1 != '\0') {
sub_806F370(pokemon,target,gUnknown_80F4FAE,1,&uStack_24,0,0x217,0,0,0);
sub_8071DA4(pokemon);
@ -820,7 +820,7 @@ bool8 sub_8048950(Entity *param_1,Item *item)
moveID = GetItemMoveID(item->id);
if ((item->flags & ITEM_FLAG_STICKY)) {
PrintFieldMessage(0,*gUnknown_80FE3E8,1);
PrintFieldMessage(0,*gItemStickyDoesntWorkText,1);
return FALSE;
}
else if (IsHMItem(item->id)) {
@ -871,7 +871,7 @@ bool8 sub_8048A68(Entity *param_1,Item *item)
PokemonStruct2 *pokemon;
if ((item->flags & ITEM_FLAG_STICKY)) {
PrintFieldMessage(0,*gUnknown_80FE3E8,1);
PrintFieldMessage(0,*gItemStickyDoesntWorkText,1);
return FALSE;
}
else
@ -947,7 +947,7 @@ bool32 sub_8048B9C(Entity *entity,Item *param_2)
entityInfo = entity->info;
actionPointer = &(entityInfo->action);
if ((param_2->flags & ITEM_FLAG_STICKY)) {
PrintFieldMessage(0,*gUnknown_80FE3E8,1);
PrintFieldMessage(0,*gItemStickyDoesntWorkText,1);
return FALSE;
}
else
@ -1039,8 +1039,8 @@ bool8 sub_8048D50(Entity * pokemon, Item *item)
entityInfo = pokemon->info;
if ((item->flags & ITEM_FLAG_STICKY) != 0) {
sub_8045BF8(gUnknown_202DE58, item);
SendMessage(pokemon,*gUnknown_80FE3E8);
sub_8045BF8(gFormatItems, item);
SendMessage(pokemon,*gItemStickyDoesntWorkText);
return FALSE;
}
else

4
src/code_8057824_1.c
View File

@ -30,7 +30,7 @@
extern u32 gUnknown_202EDC8;
extern u8 gUnknown_202E038[0x50];
extern u8 gAvailablePokemonNames[0x58];
extern u8 gUnknown_202DE58[];
extern u8 gFormatItems[];
extern const s16 gUnknown_80F57CA;
extern const s16 gUnknown_80F57D2;
@ -3610,7 +3610,7 @@ void JirachiWish(void)
PlaySoundEffect(0xd4);
LeaderEntity = GetLeader();
SetMessageArgument(gAvailablePokemonNames,LeaderEntity,0);
sub_8092578(gUnknown_202DE58,friendArea,FALSE);
WriteFriendAreaName(gFormatItems,friendArea,FALSE);
// Obtained the friend area!
DisplayDungeonDialogue(gUnknown_8105B68);
}

32
src/code_805D8C8.c
View File

@ -11,8 +11,8 @@ extern const u8 gUnknown_8106EA0[]; // ax%03d
// ???
extern s32 sprintf(char *, const char *, ...);
static void sub_8068884(void);
static void sub_80688B0(void);
static void EnsureCastformLoaded(void);
static void EnsureDeoxysLoaded(void);
void sub_8068768(void)
{
@ -23,7 +23,7 @@ void sub_8068768(void)
entity = gDungeon->allPokemon[i];
if (entity != NULL && EntityExists(entity))
sub_8068838(entity->info->apparentID, FALSE);
LoadPokemonSprite(entity->info->apparentID, FALSE);
}
}
@ -33,13 +33,13 @@ void sub_80687AC(void)
gDungeon->unk37F4 = 10;
}
OpenedFile *sub_80687D0(s16 species)
OpenedFile *GetSpriteData(s16 species)
{
s32 species32 = species;
return gDungeon->sprites[species32];
}
static void sub_80687EC(s32 _id)
static void EnsureSpriteLoaded(s32 _id)
{
u8 name [12];
s32 id = (s16)_id;
@ -50,34 +50,34 @@ static void sub_80687EC(s32 _id)
}
}
void sub_8068838(s16 id, bool32 a1)
void LoadPokemonSprite(s16 id, bool32 a1)
{
s32 id_s32 = id;
bool8 param_2 = a1;
if (!param_2 &&
(id_s32 == MONSTER_DEOXYS_NORMAL || id_s32 == MONSTER_DEOXYS_ATTACK || id_s32 == MONSTER_DEOXYS_DEFENSE || id_s32 == MONSTER_DEOXYS_SPEED)) {
sub_80688B0();
EnsureDeoxysLoaded();
}
else {
sub_80687EC(id_s32);
EnsureSpriteLoaded(id_s32);
// >= MONSTER_CASTFORM && <= MONSTER_CASTFORM_RAINY
if ((u16)(id_s32 - MONSTER_CASTFORM) < 4)
sub_8068884();
EnsureCastformLoaded();
}
}
static void sub_8068884(void)
static void EnsureCastformLoaded(void)
{
sub_80687EC(MONSTER_CASTFORM);
sub_80687EC(MONSTER_CASTFORM_SNOWY);
sub_80687EC(MONSTER_CASTFORM_SUNNY);
sub_80687EC(MONSTER_CASTFORM_RAINY);
EnsureSpriteLoaded(MONSTER_CASTFORM);
EnsureSpriteLoaded(MONSTER_CASTFORM_SNOWY);
EnsureSpriteLoaded(MONSTER_CASTFORM_SUNNY);
EnsureSpriteLoaded(MONSTER_CASTFORM_RAINY);
}
static void sub_80688B0(void)
static void EnsureDeoxysLoaded(void)
{
sub_80687EC(gDungeon->unk3800);
EnsureSpriteLoaded(gDungeon->unk3800);
}
void CloseAllSpriteFiles(void)

36
src/code_805D8C8_1.c
View File

@ -4384,15 +4384,15 @@ bool8 sub_8060E38(Entity *a0)
bool32 sub_8069D18(Position *a0, Entity *a1);
extern const u8 gUnknown_8106BB0[];
extern const u8 gUnknown_8106BB4[];
extern const u8 gUnknown_8106BB8[];
extern const u8 gUnknown_8106BBC[];
extern const u8 gUnknown_8106BC0[];
extern const u8 gUnknown_8106BC4[];
extern const u8 gUnknown_8106BC8[];
extern const u8 gUnknown_8106BCC[];
extern const u8 gUnknown_8106BD0[];
extern const u8 gTeamFormat[];
extern const u8 gHeartRedTiny[];
extern const u8 gHeartRedSmall[];
extern const u8 gHeartRedMedium[];
extern const u8 gHeartRedLarge[];
extern const u8 gHeartYellowTiny[];
extern const u8 gHeartYellowSmall[];
extern const u8 gHeartYellowMedium[];
extern const u8 gHeartYellowLarge[];
extern const u8 gUnknown_8106BD4[];
extern const u8 gUnknown_8106BE0[];
extern const u8 gUnknown_8106BEC[];
@ -4466,7 +4466,7 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
sub_80137B0(&gUnknown_202EE10, 0);
sub_80073B8(0);
if (r10) {
PrintFormatStringOnWindow(0xC, 0, gUnknown_8106BB0, 0, 0);
PrintFormatStringOnWindow(0xC, 0, gTeamFormat, 0, 0);
}
// Print hp/max hp
@ -4483,30 +4483,30 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo
sub_8070968(gAvailablePokemonNames, monInfo, color);
if (sub_806A538(gRecruitedPokemonRef->pokemon2[monInfo->teamIndex].unkA)) {
if (monInfo->HP <= monInfo->maxHPStat / 4) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BB4);
strcpy(gAvailablePokemonNames + 0x50, gHeartRedTiny);
}
else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 2) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BB8);
strcpy(gAvailablePokemonNames + 0x50, gHeartRedSmall);
}
else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 3) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BBC);
strcpy(gAvailablePokemonNames + 0x50, gHeartRedMedium);
}
else {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC0);
strcpy(gAvailablePokemonNames + 0x50, gHeartRedLarge);
}
}
else {
if (monInfo->HP <= monInfo->maxHPStat / 4) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC4);
strcpy(gAvailablePokemonNames + 0x50, gHeartYellowTiny);
}
else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 2) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BC8);
strcpy(gAvailablePokemonNames + 0x50, gHeartYellowSmall);
}
else if (monInfo->HP <= (monInfo->maxHPStat / 4) * 3) {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BCC);
strcpy(gAvailablePokemonNames + 0x50, gHeartYellowMedium);
}
else {
strcpy(gAvailablePokemonNames + 0x50, gUnknown_8106BD0);
strcpy(gAvailablePokemonNames + 0x50, gHeartYellowLarge);
}
}

Some files were not shown because too many files have changed in this diff Show More