summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_803D110.s20
-rw-r--r--asm/code_8040094.s26
-rw-r--r--asm/code_8041AD0.s6
-rw-r--r--asm/code_80428A0.s104
-rw-r--r--asm/code_80450F8.s54
-rw-r--r--asm/code_8048480.s362
-rw-r--r--asm/code_80521D0.s96
-rw-r--r--asm/code_8057144.s20
-rw-r--r--asm/code_8057824.s464
-rw-r--r--asm/code_807001C.s100
-rw-r--r--asm/code_8070D04.s88
-rw-r--r--asm/code_8071518.s26
-rw-r--r--asm/code_8071858.s6
-rw-r--r--asm/code_80718D8.s92
-rw-r--r--asm/code_80739DC.s100
-rw-r--r--asm/code_8075BA4.s564
-rw-r--r--asm/code_80848F0.s4
-rw-r--r--asm/code_8085B0C.s2
-rw-r--r--asm/code_8094148.s6
-rw-r--r--asm/jirachi_wish.s10
20 files changed, 1075 insertions, 1075 deletions
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index d2ff740..1bf4f5d 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -641,7 +641,7 @@ _0803D5A8:
str r1, [r7]
str r2, [r7, 0x4]
adds r0, r6
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
cmp r0, 0
beq _0803D5E8
@@ -966,7 +966,7 @@ _0803D840:
ldr r0, [r5]
adds r0, r2
str r2, [sp]
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
ldr r2, [sp]
cmp r0, 0
@@ -1033,7 +1033,7 @@ _0803D8B8:
adds r1, r4, r0
ldr r0, [r7]
adds r0, r1
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -1109,7 +1109,7 @@ _0803D954:
bgt _0803D968
ldr r0, [r7]
adds r0, r4
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -1185,7 +1185,7 @@ _0803D9D0:
beq _0803DA00
_0803D9E0:
adds r0, r2, r4
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
b _0803DA14
@@ -1233,14 +1233,14 @@ sub_803DA20:
_0803DA3A:
ldr r0, [r6]
adds r0, r4
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
cmp r0, r7
bne _0803DA60
ldr r0, [r6]
adds r0, r4
- bl sub_808E9E4
+ bl ExtractLevel
b _0803DA72
.align 2, 0
_0803DA54: .4byte gDungeonGlobalData
@@ -4516,7 +4516,7 @@ _0803F45A:
beq _0803F494
adds r0, r2, 0
adds r1, r4, 0
- bl sub_8083294
+ bl InSameRoom_2
lsls r0, 24
lsrs r0, 24
b _0803F49A
@@ -4813,7 +4813,7 @@ _0803F6B4:
ldrb r2, [r4]
mov r8, r2
adds r0, r6, 0
- bl sub_8071884
+ bl CanSeeInvisible
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -5469,7 +5469,7 @@ _0803FBBA:
lsls r3, 1
adds r0, r3
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bne _0803FBD2
movs r0, 0x1
diff --git a/asm/code_8040094.s b/asm/code_8040094.s
index 4df6052..b4488f1 100644
--- a/asm/code_8040094.s
+++ b/asm/code_8040094.s
@@ -1375,7 +1375,7 @@ sub_8040BB0:
mov r8, r0
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1387,7 +1387,7 @@ sub_8040BB0:
mov r9, r5
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1446,7 +1446,7 @@ sub_8040C4C:
adds r4, r1, 0
adds r6, r2, 0
ldrh r5, [r4, 0x2]
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1466,7 +1466,7 @@ sub_8040C4C:
ldrsh r5, [r6, r0]
ldrh r4, [r4, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1619,7 +1619,7 @@ sub_8040DA0:
mov r1, r8
ldrh r4, [r1, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1764,7 +1764,7 @@ _08040EF0:
mov r0, r8
ldrh r4, [r0, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1933,7 +1933,7 @@ sub_8041038:
mov r9, r0
ldrh r4, [r2, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1954,7 +1954,7 @@ sub_8041038:
mov r0, r8
ldrh r4, [r0, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2031,7 +2031,7 @@ sub_8041108:
adds r5, r3, 0
ldrh r4, [r2, 0x2]
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2088,7 +2088,7 @@ sub_8041168:
_0804118A:
ldrh r4, [r7, 0x2]
mov r0, r8
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2479,7 +2479,7 @@ _08041476:
bne _0804148E
_0804147E:
adds r0, r4, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
beq _080414A0
@@ -2490,7 +2490,7 @@ _0804148E:
cmp r0, 0x97
bne _080414A4
adds r0, r4, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2524,7 +2524,7 @@ sub_80414C0:
bne _080414DC
adds r0, r5, 0
bl sub_8045128
- bl sub_804AF20
+ bl IsTileWater
lsls r0, 24
cmp r0, 0
bne _080414F2
diff --git a/asm/code_8041AD0.s b/asm/code_8041AD0.s
index 3d4c664..7d4f30a 100644
--- a/asm/code_8041AD0.s
+++ b/asm/code_8041AD0.s
@@ -511,7 +511,7 @@ _08042650: .4byte 0x0000ffff
_08042654: .4byte gDungeonGlobalData
_08042658: .4byte 0x000181f2
_0804265C: .4byte 0x00000165
-_08042660: .4byte gUnknown_80F4448
+_08042660: .4byte gAdjacentTileOffsets
_08042664:
movs r6, 0x1
negs r6, r6
@@ -753,7 +753,7 @@ sub_8042818:
ldr r4, [r0]
cmp r4, 0
bne _08042836
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
_08042836:
ldr r1, _0804287C
@@ -775,7 +775,7 @@ _0804284A:
blt _08042896
cmp r7, 0
beq _08042888
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _08042888
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index 54c5963..b776ebc 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -1050,7 +1050,7 @@ _080432CC: .4byte 0x00000226
_080432D0:
ldr r4, _080432E4
_080432D2:
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0
@@ -1283,7 +1283,7 @@ _080434A6:
b _0804351C
.align 2, 0
_080434B8: .4byte gPtrFinalChanceMessage
-_080434BC: .4byte gUnknown_203B450
+_080434BC: .4byte gLeaderPokemon
_080434C0: .4byte gDungeonGlobalData
_080434C4: .4byte 0x000037ec
_080434C8: .4byte 0x000037fc
@@ -1368,7 +1368,7 @@ _08043594:
bl sub_806B6C4
b _080435D4
.align 2, 0
-_080435B4: .4byte gUnknown_80F5668
+_080435B4: .4byte gDungeonMusic
_080435B8: .4byte gDungeonGlobalData
_080435BC: .4byte 0x00003a10
_080435C0: .4byte gUnknown_202EDC8
@@ -1532,9 +1532,9 @@ _08043728:
_08043730: .4byte gDungeonGlobalData
_08043734: .4byte 0x0000066c
_08043738: .4byte 0x0000066d
-_0804373C: .4byte gUnknown_203B450
+_0804373C: .4byte gLeaderPokemon
_08043740:
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_803F4A0
bl sub_8040A84
_0804374C:
@@ -1547,7 +1547,7 @@ _0804374C:
bne _0804377C
bl sub_807E5AC
movs r0, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
cmp r0, 0
beq _0804377C
@@ -1557,7 +1557,7 @@ _0804374C:
.align 2, 0
_08043774: .4byte gDungeonGlobalData
_08043778:
- bl sub_8069E8C
+ bl TriggerWeatherAbilities
_0804377C:
cmp r6, 0
beq _08043784
@@ -1565,7 +1565,7 @@ _0804377C:
b _080437A2
_08043784:
bl sub_80427AC
- bl sub_8083600
+ bl GetLeaderEntity
ldr r2, _08043960
ldr r1, [r2]
ldr r3, _08043964
@@ -1603,7 +1603,7 @@ _080437C8:
cmp r0, 0
beq _080437C8
_080437DA:
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -1645,7 +1645,7 @@ _08043822:
bne _08043830
bl sub_806AA70
_08043830:
- bl sub_8083600
+ bl GetLeaderEntity
bl EntityExists
lsls r0, 24
cmp r0, 0
@@ -1743,7 +1743,7 @@ _080438AC:
ldrb r0, [r1, 0x6]
cmp r0, 0
beq _08043926
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
ldr r0, _0804398C
ldr r1, [r0]
@@ -1831,7 +1831,7 @@ _080439D4:
_080439DC:
cmp r0, 0x2
bne _08043A00
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
ldr r0, _080439F8
movs r1, 0
@@ -1846,7 +1846,7 @@ _080439FC: .4byte 0x0000066e
_08043A00:
cmp r0, 0x3
bne _08043A24
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
ldr r0, _08043A1C
movs r1, 0
@@ -1879,7 +1879,7 @@ _08043A2A:
ldrb r0, [r0]
cmp r0, 0x2
bne _08043A74
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
movs r0, 0x8A
lsls r0, 2
@@ -1947,7 +1947,7 @@ _08043ADC: .4byte 0x00000644
_08043AE0: .4byte 0x0000060b
_08043AE4:
ldr r4, _08043B80
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0
@@ -2212,7 +2212,7 @@ _08043D08:
pop {r1}
bx r1
.align 2, 0
-_08043D0C: .4byte gUnknown_810ACC0
+_08043D0C: .4byte gDungeonWaterType
thumb_func_end sub_8043CE4
thumb_func_start sub_8043D10
@@ -2239,7 +2239,7 @@ sub_8043D10:
.align 2, 0
_08043D38: .4byte gDungeonGlobalData
_08043D3C:
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _08043D4A
@@ -2410,7 +2410,7 @@ _08043E6A:
_08043E6E:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldr r4, [r0, 0x14]
adds r0, r4, 0
bl EntityExists
@@ -2471,7 +2471,7 @@ _08043EEA:
ldrb r0, [r0, 0x10]
cmp r0, 0x1
bne _08043F40
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2503,7 +2503,7 @@ _08043F3C: .4byte 0x0000021f
_08043F40:
cmp r0, 0x2
bne _08043F74
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2525,7 +2525,7 @@ _08043F70: .4byte gUnknown_80F89D4
_08043F74:
cmp r0, 0x3
bne _08043FB6
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2828,8 +2828,8 @@ _080441B4: .4byte gTeamInventory_203B460
_080441B8: .4byte gRecruitedPokemonRef
thumb_func_end sub_8044124
- thumb_func_start sub_80441BC
-sub_80441BC:
+ thumb_func_start IsBossBattle
+IsBossBattle:
push {lr}
ldr r0, _080441D8
ldr r0, [r0]
@@ -2851,10 +2851,10 @@ _080441E0:
_080441E2:
pop {r1}
bx r1
- thumb_func_end sub_80441BC
+ thumb_func_end IsBossBattle
- thumb_func_start sub_80441E8
-sub_80441E8:
+ thumb_func_start IsFixedDungeon
+IsFixedDungeon:
push {lr}
ldr r0, _08044200
ldr r0, [r0]
@@ -2874,7 +2874,7 @@ _08044208:
_0804420A:
pop {r1}
bx r1
- thumb_func_end sub_80441E8
+ thumb_func_end IsFixedDungeon
thumb_func_start sub_8044210
sub_8044210:
@@ -2973,13 +2973,13 @@ xxx_dungeon_80442D0:
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
cmp r5, 0
beq _0804431A
- bl sub_8069E8C
+ bl TriggerWeatherAbilities
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
ldr r3, _08044320
ldr r1, _08044324
ldr r1, [r1]
@@ -3008,15 +3008,15 @@ _0804431A:
movs r0, 0
b _0804444E
.align 2, 0
-_08044320: .4byte gUnknown_80F6860
+_08044320: .4byte gSpeedTurns
_08044324: .4byte gDungeonGlobalData
_08044328:
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
cmp r5, 0
beq _0804431A
movs r0, 0
- bl sub_807520C
+ bl UseAttack
lsls r0, 24
cmp r0, 0
bne _0804435C
@@ -3062,7 +3062,7 @@ _0804438C: .4byte 0x0000066c
_08044390: .4byte 0x00000673
_08044394:
adds r0, r5, 0
- bl sub_8074B54
+ bl TickStatusHeal
_0804439A:
bl sub_8044B28
lsls r0, 24
@@ -3188,7 +3188,7 @@ _08044466:
cmp r0, 0
bne _080444E2
adds r0, r4, 0
- bl sub_8074B54
+ bl TickStatusHeal
adds r0, r4, 0
bl EntityExists
lsls r0, 24
@@ -3231,7 +3231,7 @@ _080444F0: .4byte 0x00007fff
sub_80444F4:
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
cmp r6, r0
bne _08044566
ldr r0, _0804456C
@@ -3298,7 +3298,7 @@ sub_8044574:
mov r5, r8
push {r5-r7}
sub sp, 0x44
- bl sub_8083600
+ bl GetLeaderEntity
mov r10, r0
movs r7, 0
mov r0, sp
@@ -3333,13 +3333,13 @@ _08044592:
ldr r0, [r1]
adds r0, 0xB8
str r5, [r0]
- bl sub_8069E8C
+ bl TriggerWeatherAbilities
movs r2, 0xA2
lsls r2, 1
adds r0, r6, r2
strb r4, [r0]
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
mov r3, r9
ldr r1, [r3]
movs r2, 0xCC
@@ -3386,14 +3386,14 @@ _08044592:
.align 2, 0
_08044634: .4byte gDungeonGlobalData
_08044638: .4byte 0x0001357c
-_0804463C: .4byte gUnknown_80F6860
+_0804463C: .4byte gSpeedTurns
_08044640: .4byte 0x0000bfff
_08044644:
ldr r1, _08044668
add r1, r8
strb r0, [r1]
adds r0, r5, 0
- bl sub_8074B54
+ bl TickStatusHeal
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -3631,13 +3631,13 @@ sub_8044820:
mov r8, r0
b _080448FC
.align 2, 0
-_08044830: .4byte gUnknown_80F6860
+_08044830: .4byte gSpeedTurns
_08044834:
ldr r4, [r5, 0x70]
ldr r0, [r6]
adds r0, 0xB8
str r5, [r0]
- bl sub_8069E8C
+ bl TriggerWeatherAbilities
ldrh r2, [r4]
movs r1, 0x80
lsls r1, 8
@@ -3666,7 +3666,7 @@ _0804486C:
adds r0, r4, r2
strb r1, [r0]
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
ldr r1, [r6]
movs r2, 0xCC
lsls r2, 3
@@ -3698,7 +3698,7 @@ _0804486C:
adds r1, r4, r2
strb r0, [r1]
adds r0, r5, 0
- bl sub_8074B54
+ bl TickStatusHeal
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -3928,7 +3928,7 @@ _08044A8A:
pop {r0}
bx r0
.align 2, 0
-_08044A94: .4byte gUnknown_80F6860
+_08044A94: .4byte gSpeedTurns
_08044A98: .4byte gDungeonGlobalData
_08044A9C: .4byte 0x000037f8
_08044AA0: .4byte 0x000037f9
@@ -3960,7 +3960,7 @@ sub_8044AB4:
movs r4, 0
b _08044AE6
.align 2, 0
-_08044ADC: .4byte gUnknown_80F6860
+_08044ADC: .4byte gSpeedTurns
_08044AE0: .4byte gDungeonGlobalData
_08044AE4:
adds r4, 0x1
@@ -3979,7 +3979,7 @@ _08044AE6:
cmp r0, 0
beq _08044AE4
movs r0, 0
- bl sub_807520C
+ bl UseAttack
_08044B08:
movs r0, 0x1
movs r1, 0
@@ -4004,7 +4004,7 @@ sub_8044B28:
ldrb r0, [r0, 0x4]
cmp r0, 0
bne _08044B76
- bl sub_8083600
+ bl GetLeaderEntity
cmp r0, 0
bne _08044B50
ldr r0, [r4]
@@ -4705,8 +4705,8 @@ _08045022:
bx r0
thumb_func_end sub_8044FF0
- thumb_func_start sub_8045028
-sub_8045028:
+ thumb_func_start IsNotAttacking
+IsNotAttacking:
push {r4,lr}
adds r2, r0, 0
lsls r1, 24
@@ -4738,7 +4738,7 @@ _0804505C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8045028
+ thumb_func_end IsNotAttacking
thumb_func_start sub_8045064
sub_8045064:
diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s
index e6d0d2f..53a6e20 100644
--- a/asm/code_80450F8.s
+++ b/asm/code_80450F8.s
@@ -792,7 +792,7 @@ sub_8045708:
ldrsh r0, [r1, r2]
movs r3, 0x2
ldrsh r1, [r1, r3]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -800,7 +800,7 @@ sub_8045708:
bne _0804579C
b _080457C4
.align 2, 0
-_08045744: .4byte gUnknown_810ACC0
+_08045744: .4byte gDungeonWaterType
_08045748: .4byte gDungeonGlobalData
_0804574C: .4byte 0x00003a0e
_08045750:
@@ -952,7 +952,7 @@ _0804584C:
beq _08045880
adds r1, r4, 0x4
adds r0, r2, 0
- bl sub_8083294
+ bl InSameRoom_2
lsls r0, 24
lsrs r0, 24
b _08045882
@@ -1127,7 +1127,7 @@ CanSee:
cmp r0, 0x1
bne _080459DE
adds r0, r5, 0
- bl sub_8071884
+ bl CanSeeInvisible
lsls r0, 24
cmp r0, 0
bne _080459D8
@@ -1153,7 +1153,7 @@ _080459E8:
_080459EC:
adds r0, r5, 0x4
adds r1, r4, 0x4
- bl sub_8083294
+ bl InSameRoom_2
lsls r0, 24
lsrs r0, 24
_080459F8:
@@ -1162,8 +1162,8 @@ _080459F8:
bx r1
thumb_func_end CanSee
- thumb_func_start sub_8045A00
-sub_8045A00:
+ thumb_func_start CanSee_2
+CanSee_2:
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -1188,7 +1188,7 @@ sub_8045A00:
cmp r0, 0x1
bne _08045A4E
adds r0, r5, 0
- bl sub_8071884
+ bl CanSeeInvisible
lsls r0, 24
cmp r0, 0
bne _08045A48
@@ -1214,14 +1214,14 @@ _08045A58:
_08045A5C:
adds r0, r5, 0x4
adds r1, r4, 0x4
- bl sub_808333C
+ bl InSameRoom_3
lsls r0, 24
lsrs r0, 24
_08045A68:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8045A00
+ thumb_func_end CanSee_2
thumb_func_start sub_8045A70
sub_8045A70:
@@ -1244,7 +1244,7 @@ sub_8045A70:
beq _08045AA4
adds r0, r5, 0x4
adds r1, r4, 0x4
- bl sub_8083294
+ bl InSameRoom_2
lsls r0, 24
lsrs r0, 24
b _08045AA6
@@ -1260,23 +1260,23 @@ _08045AA6:
sub_8045AAC:
push {lr}
adds r0, 0x4
- bl sub_8083294
+ bl InSameRoom_2
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_8045AAC
- thumb_func_start sub_8045ABC
-sub_8045ABC:
+ thumb_func_start InSameRoom
+InSameRoom:
push {lr}
adds r0, 0x4
- bl sub_808333C
+ bl InSameRoom_3
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8045ABC
+ thumb_func_end InSameRoom
thumb_func_start sub_8045ACC
sub_8045ACC:
@@ -1411,7 +1411,7 @@ _08045BB6:
ldr r1, [r4, 0x70]
adds r0, r5, 0
adds r2, r6, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
b _08045BEC
_08045BC2:
adds r0, r4, 0
@@ -1690,7 +1690,7 @@ sub_8045DB4:
lsls r1, 24
lsrs r1, 24
str r1, [sp, 0xA8]
- bl sub_8083600
+ bl GetLeaderEntity
adds r7, r0, 0
ldr r0, [r7, 0x70]
str r0, [sp, 0xAC]
@@ -1723,7 +1723,7 @@ _08045DF4:
_08045E08:
adds r0, r7, 0
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _08045E40
@@ -2115,7 +2115,7 @@ _08046110:
ldrsh r0, [r5, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
- bl sub_8049590
+ bl GetMapEntity
str r4, [r0, 0x14]
ldrh r1, [r0]
movs r0, 0x20
@@ -2201,7 +2201,7 @@ sub_80461C8:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r2, r3]
- bl sub_8049590
+ bl GetMapEntity
adds r6, r0, 0
ldr r5, [r6, 0x14]
cmp r5, 0
@@ -3791,7 +3791,7 @@ _08046E1E:
bl FillInventoryGaps
cmp r6, 0
beq _08046ED4
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
ldr r0, _08046EE0
bl sub_80855E4
@@ -4404,7 +4404,7 @@ _080472E8: .4byte 0xfffffdc0
_080472EC: .4byte gDungeonGlobalData
_080472F0: .4byte 0x00018210
_080472F4: .4byte 0x0001c05e
-_080472F8: .4byte gUnknown_80F4448
+_080472F8: .4byte gAdjacentTileOffsets
_080472FC: .4byte gUnknown_80F4D64
_08047300:
mov r8, r4
@@ -4427,7 +4427,7 @@ _0804731A:
ldr r1, [sp, 0x228]
ldr r2, [sp, 0x22C]
bl sub_804539C
- bl sub_804AF74
+ bl IsWaterTileset
lsls r0, 24
movs r2, 0
cmp r0, 0
@@ -4709,7 +4709,7 @@ _0804752C:
b _080475A8
.align 2, 0
_08047564: .4byte gUnknown_80F94F0
-_08047568: .4byte gUnknown_80F4448
+_08047568: .4byte gAdjacentTileOffsets
_0804756C: .4byte 0xffff0000
_08047570: .4byte 0x0000ffff
_08047574:
@@ -4975,7 +4975,7 @@ _08047762:
ldr r0, [sp, 0x1C]
adds r1, r3, 0
bl sub_8045394
- bl sub_804AF74
+ bl IsWaterTileset
lsls r0, 24
movs r2, 0
cmp r0, 0
@@ -5383,7 +5383,7 @@ _08047ABC:
bl sub_8042390
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806F450
+ bl SetShopkeeperAggression
_08047AD0:
ldrb r1, [r7]
movs r0, 0x8
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index 42844ac..42f7632 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -42,7 +42,7 @@ _08048568:
lsls r0, 1
adds r5, r0
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
beq _08048598
mov r0, sp
@@ -494,7 +494,7 @@ _080488D8:
mov r1, r8
bl sub_80522F4
mov r0, r8
- bl sub_807191C
+ bl LoadIQSkills
adds r0, r5, 0
adds r1, r7, 0
bl sub_806A7E8
@@ -1559,7 +1559,7 @@ _0804929C:
lsls r1, 1
adds r0, r3, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
ble _080492AE
b _0804948A
@@ -1634,7 +1634,7 @@ _0804931C:
b _080494E2
_08049320:
adds r0, r4, 0
- bl sub_8070A58
+ bl HasNegativeStatus
lsls r0, 24
movs r6, 0
b _080494BC
@@ -1662,7 +1662,7 @@ _08049344:
b _080494E0
_0804934A:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x64
cmp r0, 0
@@ -1673,14 +1673,14 @@ _0804935A:
b _080494E2
_0804935E:
adds r0, r4, 0
- bl sub_8071884
+ bl CanSeeInvisible
lsls r0, 24
cmp r0, 0
beq _0804936C
b _080494A2
_0804936C:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
@@ -1695,7 +1695,7 @@ _08049378:
b _080494A2
_08049388:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
@@ -1708,7 +1708,7 @@ _08049394:
b _080494A2
_080493A0:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
@@ -1726,7 +1726,7 @@ _080493B8:
cmp r0, 0x2
beq _080494A2
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0xF
b _080494BC
@@ -1747,7 +1747,7 @@ _080493E0:
cmp r0, 0x1
beq _080494A2
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
@@ -1755,7 +1755,7 @@ _080493F6:
cmp r2, 0
bne _0804940C
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
cmp r0, 0
@@ -1776,7 +1776,7 @@ _0804940C:
bne _08049432
_08049420:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x32
cmp r0, 0
@@ -1797,7 +1797,7 @@ _08049436:
cmp r0, 0x3
beq _080494A2
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
@@ -1829,7 +1829,7 @@ _0804947A:
lsls r1, 1
adds r0, r3, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
ble _080494E0
_0804948A:
@@ -1852,13 +1852,13 @@ _080494A2:
b _080494E4
_080494A6:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x5
b _080494BC
_080494B2:
adds r0, r4, 0
- bl sub_80494EC
+ bl CanTargetAdjacentPokemon
lsls r0, 24
movs r6, 0x1E
_080494BC:
@@ -1870,7 +1870,7 @@ _080494C2:
lsls r2, 1
adds r0, r3, r2
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x9
bgt _080494E0
movs r0, 0x64
@@ -1893,8 +1893,8 @@ _080494E4:
bx r1
thumb_func_end EvaluateItem
- thumb_func_start sub_80494EC
-sub_80494EC:
+ thumb_func_start CanTargetAdjacentPokemon
+CanTargetAdjacentPokemon:
push {r4-r6,lr}
adds r5, r0, 0
movs r6, 0
@@ -1924,7 +1924,7 @@ _080494F2:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1932,7 +1932,7 @@ _080494F2:
movs r0, 0x1
b _08049544
.align 2, 0
-_08049538: .4byte gUnknown_80F4448
+_08049538: .4byte gAdjacentTileOffsets
_0804953C:
adds r6, 0x1
cmp r6, 0x7
@@ -1942,7 +1942,7 @@ _08049544:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80494EC
+ thumb_func_end CanTargetAdjacentPokemon
thumb_func_start GetMapTileAtPosition
GetMapTileAtPosition:
@@ -1982,8 +1982,8 @@ _08049588:
_0804958C: .4byte gUnknown_203B430
thumb_func_end GetMapTileAtPosition
- thumb_func_start sub_8049590
-sub_8049590:
+ thumb_func_start GetMapEntity
+GetMapEntity:
push {r4,r5,lr}
adds r2, r0, 0
adds r3, r1, 0
@@ -2027,7 +2027,7 @@ _080495D6:
.align 2, 0
_080495DC: .4byte gDungeonGlobalData
_080495E0: .4byte 0x0000e8c0
- thumb_func_end sub_8049590
+ thumb_func_end GetMapEntity
thumb_func_start sub_80495E4
sub_80495E4:
@@ -2270,7 +2270,7 @@ _080497FC: .4byte gDungeonFileArchive
_08049800: .4byte gUnknown_202F18C
_08049804: .4byte gUnknown_202EE8C
_08049808: .4byte gUnknown_202F314
-_0804980C: .4byte gUnknown_810ACC0
+_0804980C: .4byte gDungeonWaterType
_08049810:
strb r6, [r2, 0x4]
strb r3, [r2, 0x5]
@@ -2404,7 +2404,7 @@ _080498D0:
bgt _0804991C
mov r0, r10
mov r1, r9
- bl sub_8049590
+ bl GetMapEntity
ldr r2, [r4]
mov r3, r9
lsls r1, r3, 1
@@ -2418,7 +2418,7 @@ _08049918: .4byte 0x00003a0e
_0804991C:
mov r0, r10
mov r1, r9
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
b _08049B70
_08049928:
@@ -2723,7 +2723,7 @@ _08049B3C:
bne _08049B4A
movs r4, 0
_08049B4A:
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _08049B56
@@ -2731,7 +2731,7 @@ _08049B4A:
_08049B56:
mov r0, r10
mov r1, r9
- bl sub_8049590
+ bl GetMapEntity
ldr r1, _08049B84
ldr r2, [r1]
lsls r1, r7, 1
@@ -3177,22 +3177,22 @@ _08049E84:
_08049E94:
mov r0, r10
ldr r1, [sp, 0x40]
- bl sub_8049590
+ bl GetMapEntity
ldr r1, [sp]
strb r1, [r0, 0xA]
mov r0, r10
ldr r1, [sp, 0x40]
- bl sub_8049590
+ bl GetMapEntity
ldr r1, [sp, 0x4]
strb r1, [r0, 0xB]
mov r0, r10
ldr r1, [sp, 0x40]
- bl sub_8049590
+ bl GetMapEntity
ldr r1, [sp, 0x8]
strb r1, [r0, 0xC]
mov r0, r10
ldr r1, [sp, 0x40]
- bl sub_8049590
+ bl GetMapEntity
ldr r1, [sp, 0xC]
strb r1, [r0, 0xD]
add sp, 0x44
@@ -4312,7 +4312,7 @@ sub_804A728:
ldr r6, _0804A814
ldr r0, [r6]
mov r8, r0
- bl sub_8083600
+ bl GetLeaderEntity
str r0, [sp, 0x24]
ldr r0, _0804A818
add r0, r8
@@ -4418,7 +4418,7 @@ _0804A7AC:
_0804A814: .4byte gDungeonGlobalData
_0804A818: .4byte 0x000181f0
_0804A81C: .4byte 0x0001821a
-_0804A820: .4byte gUnknown_80F4448
+_0804A820: .4byte gAdjacentTileOffsets
_0804A824: .4byte gUnknown_80F6A4A
_0804A828: .4byte gUnknown_80F6C06
_0804A82C: .4byte 0x000181f2
@@ -4764,7 +4764,7 @@ _0804AAB2:
_0804AAB6:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
strh r7, [r0, 0x4]
adds r4, 0x1
cmp r4, 0x37
@@ -5028,7 +5028,7 @@ _0804ACA8:
_0804ACB0:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x3
orrs r1, r2
@@ -5114,7 +5114,7 @@ sub_804AD34:
ldrsh r0, [r6, r1]
movs r2, 0x2
ldrsh r1, [r6, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -5219,7 +5219,7 @@ sub_804AE08:
ldrsh r0, [r7, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -5281,7 +5281,7 @@ sub_804AE84:
ldrsh r0, [r5, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2, 0x4]
movs r0, 0x10
@@ -5351,12 +5351,12 @@ _0804AF18: .4byte gDungeonGlobalData
_0804AF1C: .4byte 0x000135cc
thumb_func_end sub_804AE84
- thumb_func_start sub_804AF20
-sub_804AF20:
+ thumb_func_start IsTileWater
+IsTileWater:
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0
- bl sub_804AF74
+ bl IsWaterTileset
lsls r0, 24
cmp r0, 0
beq _0804AF3C
@@ -5391,13 +5391,13 @@ _0804AF5E:
pop {r1}
bx r1
.align 2, 0
-_0804AF68: .4byte gUnknown_810ACC0
+_0804AF68: .4byte gDungeonWaterType
_0804AF6C: .4byte gDungeonGlobalData
_0804AF70: .4byte 0x00003a0e
- thumb_func_end sub_804AF20
+ thumb_func_end IsTileWater
- thumb_func_start sub_804AF74
-sub_804AF74:
+ thumb_func_start IsWaterTileset
+IsWaterTileset:
push {lr}
ldr r0, _0804AF9C
ldr r0, [r0]
@@ -5426,7 +5426,7 @@ _0804AFA4:
_0804AFA6:
pop {r1}
bx r1
- thumb_func_end sub_804AF74
+ thumb_func_end IsWaterTileset
thumb_func_start sub_804AFAC
sub_804AFAC:
@@ -5598,7 +5598,7 @@ _0804B0FC: .4byte gUnknown_202F1AA
_0804B100: .4byte gUnknown_202F1AB
_0804B104: .4byte gUnknown_202F1AC
_0804B108: .4byte gUnknown_202F1A8
-_0804B10C: .4byte gUnknown_810ACC0
+_0804B10C: .4byte gDungeonWaterType
_0804B110: .4byte 0x00003a0e
_0804B114: .4byte gUnknown_202F1B4
_0804B118: .4byte gUnknown_202F1AE
@@ -6102,7 +6102,7 @@ _0804B55A:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0xC]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r0, [r2]
ldr r6, _0804B630
@@ -6619,7 +6619,7 @@ _0804B962:
ldr r2, _0804B9F0
add r2, sp
str r3, [r2]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r9
ands r1, r2
@@ -6628,7 +6628,7 @@ _0804B962:
strh r1, [r0]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldr r1, _0804B9D0
add r1, sp
ldrb r1, [r1]
@@ -6717,7 +6717,7 @@ _0804B9F4:
strh r0, [r7, 0x6]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, _0804BBF8
adds r2, r3, 0
@@ -6727,7 +6727,7 @@ _0804B9F4:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xFF
strb r1, [r0, 0x9]
_0804BA72:
@@ -7228,7 +7228,7 @@ _0804BE84:
ldr r2, _0804BEFC
add r2, sp
str r3, [r2]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r8
ands r1, r2
@@ -7237,7 +7237,7 @@ _0804BE84:
strh r1, [r0]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldr r1, _0804BEE0
add r1, sp
ldrb r1, [r1]
@@ -7325,7 +7325,7 @@ _0804BF00:
strh r0, [r7, 0x6]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r6, _0804C090
adds r2, r6, 0
@@ -7335,7 +7335,7 @@ _0804BF00:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xFF
strb r1, [r0, 0x9]
_0804BF88:
@@ -7986,7 +7986,7 @@ _0804C4C2:
_0804C4CE:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ands r1, r7
movs r2, 0x1
@@ -8587,7 +8587,7 @@ _0804C95C:
_0804C972:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r8
ands r1, r2
@@ -8596,7 +8596,7 @@ _0804C972:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
strb r1, [r0, 0x9]
adds r4, 0x1
@@ -8796,7 +8796,7 @@ _0804CB0C:
lsls r2, 5
add r2, sp
str r3, [r2]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r8
ands r1, r2
@@ -8805,7 +8805,7 @@ _0804CB0C:
strh r1, [r0]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xE5
lsls r1, 5
add r1, sp
@@ -9019,7 +9019,7 @@ _0804CCC0:
adds r4, r0, r1
b _0804CCF0
.align 2, 0
-_0804CCE0: .4byte gUnknown_80F4448
+_0804CCE0: .4byte gAdjacentTileOffsets
_0804CCE4:
movs r1, 0
ldrsh r0, [r4, r1]
@@ -9040,7 +9040,7 @@ _0804CCF0:
adds r4, r0, r1
b _0804CD18
.align 2, 0
-_0804CD08: .4byte gUnknown_80F4448
+_0804CD08: .4byte gAdjacentTileOffsets
_0804CD0C:
movs r1, 0
ldrsh r0, [r4, r1]
@@ -9150,7 +9150,7 @@ _0804CDC8:
str r0, [sp, 0x10]
b _0804CFD4
.align 2, 0
-_0804CDD4: .4byte gUnknown_80F4448
+_0804CDD4: .4byte gAdjacentTileOffsets
_0804CDD8:
adds r0, r7, 0
adds r1, r6, 0
@@ -9294,7 +9294,7 @@ _0804CEFA:
beq _0804CF16
adds r0, r7, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, _0804D018
adds r2, r3, 0
@@ -9434,7 +9434,7 @@ _0804D006:
bx r0
.align 2, 0
_0804D018: .4byte 0x0000fffc
-_0804D01C: .4byte gUnknown_80F4448
+_0804D01C: .4byte gAdjacentTileOffsets
_0804D020: .4byte gUnknown_202F1AE
thumb_func_end sub_804CBEC
@@ -9967,7 +9967,7 @@ _0804D3E0:
adds r0, r4, 0
adds r1, r5, 0
str r3, [sp, 0x34]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r9
ands r1, r2
@@ -9976,7 +9976,7 @@ _0804D3E0:
strh r1, [r0]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, sp
ldrb r1, [r1, 0x10]
strb r1, [r0, 0x9]
@@ -10103,7 +10103,7 @@ _0804D4BA:
strh r0, [r7, 0x6]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, _0804D530
adds r2, r3, 0
@@ -10113,7 +10113,7 @@ _0804D4BA:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xFE
strb r1, [r0, 0x9]
_0804D508:
@@ -11238,7 +11238,7 @@ _0804DCF0:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x54]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, [sp, 0x54]
ands r1, r3
@@ -11368,7 +11368,7 @@ _0804DDE0:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x54]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, [sp, 0x54]
ands r1, r3
@@ -11499,7 +11499,7 @@ _0804DED0:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x54]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, [sp, 0x54]
ands r1, r3
@@ -11618,7 +11618,7 @@ _0804DFB6:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x54]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r9
ands r1, r2
@@ -11966,7 +11966,7 @@ _0804E222:
negs r4, r4
b _0804E22E
.align 2, 0
-_0804E228: .4byte gUnknown_80F4448
+_0804E228: .4byte gAdjacentTileOffsets
_0804E22C:
adds r4, 0x1
_0804E22E:
@@ -12040,7 +12040,7 @@ _0804E2AA:
bne _0804E2F0
adds r0, r7, 0
mov r1, r8
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r4, _0804E2CC
adds r1, r4, 0
@@ -12049,7 +12049,7 @@ _0804E2AA:
b _0804E2F0
.align 2, 0
_0804E2C4: .4byte gUnknown_80F6DD5
-_0804E2C8: .4byte gUnknown_80F4448
+_0804E2C8: .4byte gAdjacentTileOffsets
_0804E2CC: .4byte 0x0000fffc
_0804E2D0:
adds r7, r3
@@ -12146,7 +12146,7 @@ _0804E360:
beq _0804E390
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E38C
adds r1, r3, 0
@@ -12196,7 +12196,7 @@ _0804E3BC:
beq _0804E3EC
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E3E8
adds r1, r3, 0
@@ -12252,7 +12252,7 @@ _0804E420:
beq _0804E450
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E44C
adds r1, r3, 0
@@ -12306,7 +12306,7 @@ _0804E482:
beq _0804E4B0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E4AC
adds r1, r3, 0
@@ -12353,7 +12353,7 @@ _0804E4D0:
beq _0804E508
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E504
adds r1, r3, 0
@@ -12402,7 +12402,7 @@ _0804E52C:
beq _0804E564
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E560
adds r1, r3, 0
@@ -12802,7 +12802,7 @@ _0804E848:
ldrsh r0, [r6, r1]
movs r2, 0x2
ldrsh r1, [r6, r2]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, _0804E99C
adds r2, r3, 0
@@ -12917,7 +12917,7 @@ _0804E908:
_0804E926:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
ldr r3, _0804E99C
adds r1, r3, 0
@@ -13051,7 +13051,7 @@ _0804EA0E:
ble _0804EA4E
subs r0, r5, 0x1
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r0, [r2, 0x9]
cmp r0, 0xFF
@@ -13076,7 +13076,7 @@ _0804EA4E:
ble _0804EA82
subs r1, r4, 0x1
adds r0, r5, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r0, [r2, 0x9]
cmp r0, 0xFF
@@ -13103,7 +13103,7 @@ _0804EA82:
bgt _0804EABA
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r0, [r2, 0x9]
cmp r0, 0xFF
@@ -13130,7 +13130,7 @@ _0804EABA:
bgt _0804EB0E
mov r0, r10
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r0, [r2, 0x9]
cmp r0, 0xFF
@@ -13163,7 +13163,7 @@ _0804EAF4:
bne _0804EB0E
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xFF
strb r1, [r0, 0x9]
_0804EB0E:
@@ -13522,7 +13522,7 @@ _0804ED98:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x50]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x20
orrs r1, r2
@@ -13608,7 +13608,7 @@ _0804EE18:
_0804EE38:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x10
orrs r1, r2
@@ -13889,7 +13889,7 @@ _0804F046:
_0804F05A:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x40
orrs r1, r2
@@ -14394,7 +14394,7 @@ _0804F40A:
beq _0804F438
subs r0, r6, 0x1
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ands r1, r7
movs r2, 0x2
@@ -14405,7 +14405,7 @@ _0804F434: .4byte 0x0000fffc
_0804F438:
subs r0, r6, 0x1
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ands r1, r7
_0804F444:
@@ -14480,7 +14480,7 @@ _0804F4BA:
movs r7, 0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
mov r3, r8
lsrs r2, r3, 24
@@ -14563,7 +14563,7 @@ _0804F550:
_0804F55A:
adds r0, r5, 0x1
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
mov r3, r8
lsrs r2, r3, 24
@@ -14573,7 +14573,7 @@ _0804F55A:
_0804F570:
subs r1, r4, 0x1
adds r0, r5, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
mov r3, r8
lsrs r2, r3, 24
@@ -14583,7 +14583,7 @@ _0804F570:
_0804F586:
subs r0, r5, 0x1
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
mov r3, r8
lsrs r2, r3, 24
@@ -14593,7 +14593,7 @@ _0804F586:
_0804F59C:
adds r1, r4, 0x1
adds r0, r5, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, r9
mov r3, r8
lsrs r2, r3, 24
@@ -14643,7 +14643,7 @@ _0804F5E2:
_0804F5F0:
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x20
orrs r1, r2
@@ -14823,7 +14823,7 @@ _0804F730:
_0804F73C:
mov r0, r8
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
adds r4, 0x1
@@ -14848,7 +14848,7 @@ _0804F75E:
_0804F76C:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x80
orrs r1, r2
@@ -14905,7 +14905,7 @@ _0804F7C8:
_0804F7D4:
adds r0, r4, 0
mov r1, r8
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
adds r4, 0x1
@@ -14930,7 +14930,7 @@ _0804F7F6:
_0804F804:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x80
orrs r1, r2
@@ -14991,7 +14991,7 @@ _0804F864:
mov r10, r0
adds r0, r5, 0
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r1, [sp]
@@ -14999,12 +14999,12 @@ _0804F864:
mov r9, r1
mov r0, r9
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r0, [sp]
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r2, [sp]
@@ -15012,118 +15012,118 @@ _0804F864:
mov r8, r2
mov r0, r8
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r6, [sp, 0x4]
subs r6, 0x1
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
adds r0, r5, 0
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r4, [sp, 0x4]
adds r4, 0x1
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r9
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
ldr r0, [sp]
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r8
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r8
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r8
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r8
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x4
bl sub_804F5C4
mov r0, r9
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x4
orrs r1, r2
strh r1, [r0, 0x4]
mov r0, r9
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
movs r2, 0x40
orrs r1, r2
strh r1, [r0, 0x4]
ldr r0, [sp]
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
movs r4, 0x2
orrs r1, r4
strh r1, [r0, 0x4]
mov r0, r9
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x4]
ldr r0, [sp]
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x4]
mov r0, r9
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
movs r4, 0x10
orrs r1, r4
strh r1, [r0, 0x4]
ldr r0, [sp]
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x4]
mov r0, r9
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x4]
ldr r0, [sp]
ldr r1, [sp, 0x4]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0, 0x4]
orrs r4, r1
strh r4, [r0, 0x4]
@@ -15212,7 +15212,7 @@ _0804FA6C:
_0804FA76:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
adds r4, 0x1
@@ -15284,7 +15284,7 @@ _0804FAD4:
movs r4, 0x2
ldrsh r1, [r7, r4]
adds r1, r2
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
_0804FB14:
@@ -15340,28 +15340,28 @@ _0804FB54:
ble _0804FBAE
adds r0, r5, 0x1
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
adds r1, r4, 0x1
adds r0, r5, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
subs r0, r5, 0x1
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
subs r1, r4, 0x1
adds r0, r5, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
_0804FBAE:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0
bl sub_804F5C4
b _0804FBD2
@@ -15402,7 +15402,7 @@ _0804FBF4:
_0804FBFA:
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -15490,7 +15490,7 @@ _0804FC8A:
bne _0804FCAE
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ands r1, r7
mov r2, r8
@@ -15533,7 +15533,7 @@ _0804FCD8:
beq _0804FCF8
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ands r1, r7
strh r1, [r0]
@@ -15583,7 +15583,7 @@ _0804FD3A:
_0804FD3E:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8049590
+ bl GetMapEntity
bl sub_804FD10
subs r3, r7, 0x1
cmp r6, 0
@@ -15721,7 +15721,7 @@ _0804FE20:
_0804FE24:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x10
orrs r1, r2
@@ -15936,7 +15936,7 @@ _0804FFAA:
adds r4, r1, r0
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
adds r5, r0, 0
ldrh r1, [r5, 0x4]
movs r0, 0x1
@@ -15967,7 +15967,7 @@ _08050002:
_08050004:
adds r0, r6, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
adds r1, r0, 0
ldrh r2, [r1]
movs r0, 0x3
@@ -16075,7 +16075,7 @@ _080500BC:
_080500D8:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x2
orrs r1, r2
@@ -16150,7 +16150,7 @@ _08050128:
_0805016C:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x2
orrs r1, r2
@@ -16262,7 +16262,7 @@ _0805024C: .4byte 0x00003a0c
_08050250: .4byte gUnknown_80F4DA0
_08050254:
ldrb r1, [r7, 0x1]
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
movs r0, 0x2
bl DungeonRandomCapped
@@ -16379,7 +16379,7 @@ _08050318:
_08050334:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x4
orrs r1, r2
@@ -16644,7 +16644,7 @@ _0805051C:
_0805053C:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x8
orrs r1, r2
@@ -16799,7 +16799,7 @@ _0805064E:
_0805066A:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0, 0x4]
movs r1, 0x8
orrs r1, r2
@@ -16967,7 +16967,7 @@ _080507A8:
bne _080507B8
mov r0, r9
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
bl sub_80506BC
_080507B8:
ldr r2, [sp, 0x68]
@@ -17108,7 +17108,7 @@ _080508CC:
cmp r1, 0
bne _080508DA
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
bl sub_80506BC
_080508DA:
ldr r1, [sp, 0x7C]
@@ -17276,7 +17276,7 @@ _08050A0A:
bne _08050A1A
ldr r0, [sp, 0x90]
ldr r1, [sp, 0x94]
- bl sub_8049590
+ bl GetMapEntity
bl sub_80506BC
_08050A1A:
adds r5, 0x1
@@ -17480,7 +17480,7 @@ _08050B7C:
subs r0, r7, 0x5
adds r1, r6, 0
str r2, [sp, 0x9C]
- bl sub_8049590
+ bl GetMapEntity
bl sub_80506BC
ldr r2, [sp, 0x9C]
_08050B92:
@@ -17513,7 +17513,7 @@ _08050BB8:
_08050BC0:
mov r0, r9
mov r1, r10
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r3, [r2]
movs r0, 0x3
@@ -17607,7 +17607,7 @@ _08050C5C:
_08050C68:
adds r0, r7, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r0, [r2]
movs r3, 0x3
@@ -17965,7 +17965,7 @@ _08050F00:
_08050F08:
adds r0, r7, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r1, [r4]
movs r0, 0x87
@@ -18204,7 +18204,7 @@ _080510D6:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp, 0x38]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
mov r2, r9
ands r1, r2
@@ -18213,7 +18213,7 @@ _080510D6:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
mov r1, sp
ldrb r1, [r1, 0x10]
strb r1, [r0, 0x9]
@@ -18299,7 +18299,7 @@ _08051162:
strh r0, [r6, 0x6]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r3, _080511EC
adds r2, r3, 0
@@ -18309,7 +18309,7 @@ _08051162:
strh r1, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0xFF
strb r1, [r0, 0x9]
ldr r4, [sp, 0x14]
@@ -18493,7 +18493,7 @@ _080512EE:
lsrs r4, 24
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
movs r1, 0x1
str r1, [sp]
adds r1, r4, 0
@@ -18541,7 +18541,7 @@ _08051338:
_08051350:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x10
@@ -18590,7 +18590,7 @@ _080513B8:
_080513BC:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x10
orrs r1, r2
@@ -18618,7 +18618,7 @@ _080513EC:
_080513F0:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -18753,7 +18753,7 @@ _080514EE:
lsrs r5, 24
adds r0, r7, 0
mov r1, r8
- bl sub_8049590
+ bl GetMapEntity
adds r6, r0, 0
ldr r1, [sp, 0x4]
ldr r2, _080515D0
@@ -18877,7 +18877,7 @@ _080515F6:
lsrs r4, 24
adds r0, r7, 0
mov r1, r8
- bl sub_8049590
+ bl GetMapEntity
adds r5, r0, 0
ldrb r6, [r5, 0x9]
movs r0, 0x1
@@ -18984,7 +18984,7 @@ _080516CA:
ldr r0, [r5]
adds r1, r4, 0
str r2, [sp, 0xC]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r2, [sp, 0xC]
ands r1, r2
@@ -19017,7 +19017,7 @@ _0805170A:
ldr r0, [r5, 0x8]
adds r1, r4, 0
str r2, [sp, 0xC]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r2, [sp, 0xC]
ands r1, r2
@@ -19063,7 +19063,7 @@ _08051762:
ldr r1, [r5, 0x4]
adds r0, r4, 0
str r2, [sp, 0xC]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r2, [sp, 0xC]
ands r1, r2
@@ -19096,7 +19096,7 @@ _080517A2:
ldr r1, [r5, 0xC]
adds r0, r4, 0
str r2, [sp, 0xC]
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
ldr r2, [sp, 0xC]
ands r1, r2
@@ -19136,7 +19136,7 @@ _080517EC:
adds r0, r7, 0
adds r1, r5, 0
str r3, [sp, 0x10]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x20
@@ -19200,7 +19200,7 @@ _08051864:
adds r0, r7, 0
adds r1, r5, 0
str r3, [sp, 0x10]
- bl sub_8049590
+ bl GetMapEntity
adds r6, r0, 0
ldrh r1, [r6]
movs r0, 0x20
@@ -19276,7 +19276,7 @@ sub_80518F0:
_080518F8:
adds r0, r5, 0
movs r1, 0x1
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
bl sub_804FD10
cmp r5, 0
@@ -19290,7 +19290,7 @@ _0805190E:
_08051914:
adds r0, r5, 0
movs r1, 0x1E
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
bl sub_804FD10
cmp r5, 0
@@ -19444,7 +19444,7 @@ sub_8051A24:
mov r8, r3
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
adds r7, r0, 0
lsls r4, 16
lsls r5, 16
@@ -19897,7 +19897,7 @@ _08051E42:
_08051E46:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrb r0, [r2, 0xE]
cmp r0, 0xF
@@ -19937,7 +19937,7 @@ sub_8051E7C:
movs r3, 0x6
ldrsh r1, [r2, r3]
subs r1, 0x1
- bl sub_8049590
+ bl GetMapEntity
str r0, [sp, 0x8]
ldrh r1, [r0]
movs r0, 0x80
@@ -20037,7 +20037,7 @@ _08051F10:
bge _08051FCA
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
ldrh r0, [r4]
movs r3, 0x80
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index 7cc0940..c7987d1 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -1272,7 +1272,7 @@ sub_8052DC0:
thumb_func_start sub_8052DD0
sub_8052DD0:
push {r4-r6,lr}
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
ldr r6, _08052E68
ldr r4, [r6]
@@ -2505,7 +2505,7 @@ _080537B0: .4byte gUnknown_80FCD28
_080537B4:
adds r0, r7, 0
mov r1, r8
- bl sub_8071A1C
+ bl GetMoveType_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -2541,7 +2541,7 @@ _080537F8:
adds r1, r7, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2590,7 +2590,7 @@ _08053854:
_08053864:
adds r0, r5, 0
movs r1, 0
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _08053874
@@ -2599,7 +2599,7 @@ _08053874:
adds r0, r7, 0
mov r1, r8
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
movs r1, 0xF0
ands r1, r0
cmp r1, 0
@@ -2611,7 +2611,7 @@ _08053888:
lsls r2, 1
adds r0, r1, r2
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
ldr r1, _080538C4
movs r3, 0
ldrsh r1, [r1, r3]
@@ -2630,7 +2630,7 @@ _080538AE:
adds r0, 0x46
ldrb r4, [r0]
mov r10, r4
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _080538CC
@@ -2749,7 +2749,7 @@ _0805397C:
bl sub_80522F4
b _080539D0
.align 2, 0
-_080539B4: .4byte gUnknown_80F4448
+_080539B4: .4byte gAdjacentTileOffsets
_080539B8: .4byte gUnknown_80F5006
_080539BC: .4byte 0x00000163
_080539C0: .4byte gUnknown_80FDDA8
@@ -2897,7 +2897,7 @@ _08053AE8:
adds r0, r7, 0
mov r1, r8
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
lsls r0, 16
asrs r1, r0, 16
ldr r0, _08053C88
@@ -2958,7 +2958,7 @@ _08053B5C:
adds r0, r7, 0
mov r1, r8
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
@@ -3109,7 +3109,7 @@ _08053CA8:
ldr r0, _08053CC8
ldr r1, [r5, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
cmp r7, r5
bne _08053CD0
ldr r0, _08053CCC
@@ -3127,7 +3127,7 @@ _08053CD0:
adds r1, r5, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _08053CEC
@@ -3274,7 +3274,7 @@ _08053DF2:
adds r1, r5, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3310,14 +3310,14 @@ _08053E4A:
adds r0, r7, 0
mov r1, r8
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
movs r1, 0xF
ands r1, r0
cmp r1, 0
bne _08053E64
adds r0, r7, 0
adds r1, r5, 0
- bl sub_806F450
+ bl SetShopkeeperAggression
_08053E64:
ldr r2, [sp, 0x24]
movs r3, 0xAC
@@ -5857,7 +5857,7 @@ sub_8055640:
mov r9, r3
ldr r7, [sp, 0x44]
adds r1, r5, 0
- bl sub_8071A1C
+ bl GetMoveType_2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -6030,7 +6030,7 @@ _080557C0:
ldr r0, _08055808
ldr r1, [r4, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r6, 0
bl sub_8045888
lsls r0, 24
@@ -6114,7 +6114,7 @@ sub_8055864:
adds r5, r2, 0
adds r6, r3, 0
adds r1, r5, 0
- bl sub_8071A1C
+ bl GetMoveType_2
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6223,7 +6223,7 @@ _0805591C:
b _0805595A
.align 2, 0
_08055944: .4byte gUnknown_81069BC
-_08055948: .4byte gUnknown_80F522C
+_08055948: .4byte gTypeEffectivenessChart
_0805594C:
ldrb r0, [r2]
lsls r0, 1
@@ -6293,7 +6293,7 @@ _080559B6:
bl CalculateFacingDir
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8071138
+ bl CanAttackInFront
lsls r0, 24
cmp r0, 0
beq _080559D4
@@ -6485,7 +6485,7 @@ _08055B30:
bne _08055B4E
_08055B3C:
adds r0, r5, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
bne _08055B5E
@@ -6496,7 +6496,7 @@ _08055B4E:
adds r0, r5, 0
movs r1, 0
_08055B52:
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _08055B5E
@@ -7112,7 +7112,7 @@ _08056068:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
- bl sub_807CD64
+ bl GetTargetingFlags
movs r4, 0xF0
adds r1, r4, 0
ands r1, r0
@@ -7124,7 +7124,7 @@ _08056084:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
- bl sub_807CD64
+ bl GetTargetingFlags
adds r1, r4, 0
ands r1, r0
cmp r1, 0x80
@@ -7135,7 +7135,7 @@ _08056084:
cmp r0, 0x97
bne _080560AE
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7158,7 +7158,7 @@ _080560CC:
ldr r0, _08056118
ldr r1, [r5, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _0805611C
adds r1, r7, 0
movs r2, 0
@@ -7204,7 +7204,7 @@ _08056136:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
- bl sub_80573CC
+ bl IsMoveUsable_2
_08056142:
lsls r0, 24
lsrs r4, r0, 24
@@ -7254,7 +7254,7 @@ _080561A0:
ldr r0, _080561D4
ldr r1, [r5, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
mov r1, r10
cmp r1, 0
bne _080561E0
@@ -7366,7 +7366,7 @@ _0805629A:
bne _080562BE
_080562AC:
adds r0, r5, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
bne _080562CE
@@ -7377,7 +7377,7 @@ _080562BE:
adds r0, r5, 0
movs r1, 0
_080562C2:
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _080562CE
@@ -7397,7 +7397,7 @@ _080562CE:
adds r4, 0x46
strb r0, [r4]
adds r0, r5, 0
- bl sub_8069DCC
+ bl TargetTileInFront
movs r2, 0
str r2, [sp, 0x12C]
_080562F4:
@@ -7632,7 +7632,7 @@ _080564BC:
ldr r0, _080564DC
ldr r1, [r6, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, [sp, 0x24]
cmp r0, 0
bne _080564E4
@@ -7746,7 +7746,7 @@ _0805658C:
_080565A4:
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7801,7 +7801,7 @@ _08056602:
beq _080566E4
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7819,7 +7819,7 @@ _08056602:
ldrsh r5, [r0, r1]
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7854,7 +7854,7 @@ _08056690:
_08056694:
ldrh r4, [r7, 0x2]
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8047,7 +8047,7 @@ _080567EC:
str r6, [sp, 0x40]
b _0805682E
.align 2, 0
-_08056814: .4byte gUnknown_80F4448
+_08056814: .4byte gAdjacentTileOffsets
_08056818: .4byte 0xffff0000
_0805681C: .4byte 0x0000ffff
_08056820:
@@ -8093,7 +8093,7 @@ _0805682E:
str r0, [sp, 0x38]
b _0805687C
.align 2, 0
-_08056874: .4byte gUnknown_80F4448
+_08056874: .4byte gAdjacentTileOffsets
_08056878:
movs r2, 0x20
str r2, [sp, 0x38]
@@ -8349,7 +8349,7 @@ _08056A66:
mov r0, r10
ldr r1, [sp, 0x1C]
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
adds r2, r0, 0
lsls r2, 16
asrs r2, 16
@@ -8540,7 +8540,7 @@ _08056BE0:
cmp r0, 0x40
bne _08056BFC
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -8588,7 +8588,7 @@ _08056C2A:
movs r4, 0xA
_08056C3C:
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -8731,7 +8731,7 @@ _08056D44:
adds r0, r5, 0
mov r1, r8
movs r2, 0
- bl sub_807CD64
+ bl GetTargetingFlags
lsls r0, 16
asrs r7, r0, 16
movs r0, 0xF
@@ -8748,7 +8748,7 @@ _08056D44:
cmp r0, 0x97
bne _08056D7E
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8845,7 +8845,7 @@ _08056E1C:
bne _08056DCC
b _08056F64
.align 2, 0
-_08056E28: .4byte gUnknown_80F4448
+_08056E28: .4byte gAdjacentTileOffsets
_08056E2C: .4byte 0xffff0000
_08056E30: .4byte 0x0000ffff
_08056E34:
@@ -9066,7 +9066,7 @@ _08056FD0:
adds r1, r7, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9079,7 +9079,7 @@ _08056FE6:
adds r1, r7, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0805702E
@@ -9099,7 +9099,7 @@ _0805700C:
adds r1, r7, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0805702E
@@ -9228,7 +9228,7 @@ _080570EA:
pop {r1}
bx r1
.align 2, 0
-_080570F0: .4byte gUnknown_81069F4
+_080570F0: .4byte gChargeMovesToStatuses
thumb_func_end sub_80570AC
.align 2, 0
diff --git a/asm/code_8057144.s b/asm/code_8057144.s
index 09ba149..cf98bf8 100644
--- a/asm/code_8057144.s
+++ b/asm/code_8057144.s
@@ -285,8 +285,8 @@ _08057340:
bx r1
thumb_func_end sub_8057308
- thumb_func_start sub_8057348
-sub_8057348:
+ thumb_func_start IsMoveUsable
+IsMoveUsable:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -334,7 +334,7 @@ _08057394:
adds r0, r7, 0
adds r1, r4, 0
mov r2, r8
- bl sub_80573CC
+ bl IsMoveUsable_2
lsls r0, 24
cmp r0, 0
bne _0805738A
@@ -357,10 +357,10 @@ _080573C0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8057348
+ thumb_func_end IsMoveUsable
- thumb_func_start sub_80573CC
-sub_80573CC:
+ thumb_func_start IsMoveUsable_2
+IsMoveUsable_2:
push {r4-r6,lr}
adds r4, r1, 0
lsls r2, 24
@@ -428,7 +428,7 @@ _08057444:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80573CC
+ thumb_func_end IsMoveUsable_2
thumb_func_start sub_805744C
sub_805744C:
@@ -594,7 +594,7 @@ sub_805755C:
lsrs r4, r1, 16
cmp r4, 0x97
bne _08057576
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -865,7 +865,7 @@ sub_8057748:
adds r5, r0, 0
adds r6, r1, 0
ldr r4, _08057778
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -911,7 +911,7 @@ sub_8057788:
adds r0, r4, 0
bl sub_8045128
adds r5, r0, 0
- bl sub_804AF20
+ bl IsTileWater
lsls r0, 24
cmp r0, 0
beq _080577BA
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index 2b983be..132fcf2 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -267,7 +267,7 @@ sub_8057BEC:
movs r0, 0
mov r8, r0
adds r0, r4, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
beq _08057C48
@@ -382,7 +382,7 @@ sub_8057CD0:
adds r6, r1, 0
mov r8, r2
adds r5, r3, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
ldr r1, _08057D18
@@ -802,7 +802,7 @@ sub_8057FF4:
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
- bl sub_807723C
+ bl GetFlashFireStatus
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -2131,7 +2131,7 @@ sub_80589D4:
adds r5, r0, 0
adds r6, r1, 0
ldr r4, _08058A04
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -3840,7 +3840,7 @@ sub_805968C:
mov r8, r1
adds r6, r2, 0
adds r7, r3, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -4062,7 +4062,7 @@ DiveMoveAction:
mov r8, r3
movs r6, 0
bl sub_8045128
- bl sub_804AF20
+ bl IsTileWater
lsls r0, 24
cmp r0, 0
beq _08059870
@@ -4397,7 +4397,7 @@ sub_8059AC4:
adds r5, r0, 0
adds r6, r1, 0
ldr r4, _08059AF4
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -4548,7 +4548,7 @@ _08059BE2:
beq _08059C08
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8071A1C
+ bl GetMoveType_2
lsls r0, 24
cmp r0, 0
beq _08059C08
@@ -4573,7 +4573,7 @@ _08059C08:
adds r4, r1, r0
ldr r1, [r4]
adds r0, r5, 0
- bl sub_8071A1C
+ bl GetMoveType_2
adds r1, r7, 0
adds r1, 0x5C
movs r2, 0
@@ -4912,7 +4912,7 @@ _08059E8A:
bne _08059F1A
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8071A1C
+ bl GetMoveType_2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -4940,7 +4940,7 @@ _08059E8A:
ldr r0, _08059F2C
ldr r1, [r6, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _08059F30
ldr r2, [r0]
adds r0, r6, 0
@@ -5094,7 +5094,7 @@ _08059FFE:
bne _0805A090
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8071A1C
+ bl GetMoveType_2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -5122,7 +5122,7 @@ _08059FFE:
ldr r0, _0805A0A0
ldr r1, [r6, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _0805A0A4
ldr r2, [r0]
adds r0, r6, 0
@@ -6131,7 +6131,7 @@ _0805A7B4:
bx r1
.align 2, 0
_0805A7C4: .4byte gUnknown_80FD170
-_0805A7C8: .4byte gUnknown_80F4448
+_0805A7C8: .4byte gAdjacentTileOffsets
_0805A7CC: .4byte 0xffff0000
_0805A7D0: .4byte 0x0000ffff
thumb_func_end sub_805A6C8
@@ -6328,7 +6328,7 @@ _0805A94C:
add r4, sp, 0x18
movs r2, 0x2
ldrsh r1, [r4, r2]
- bl sub_8049590
+ bl GetMapEntity
ldr r5, [r0, 0x10]
cmp r5, 0
beq _0805AA4C
@@ -6523,7 +6523,7 @@ sub_805AAE0:
lsls r1, 1
adds r5, r0, r1
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x1
ble _0805AB20
ldr r0, _0805AB1C
@@ -6882,7 +6882,7 @@ _0805ADA0:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0805AE0C
@@ -7228,7 +7228,7 @@ TransformMoveAction:
adds r5, r0, 0
adds r6, r1, 0
adds r4, r2, 0
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -7352,7 +7352,7 @@ sub_805B0D0:
movs r0, 0x1
b _0805B15A
.align 2, 0
-_0805B134: .4byte gUnknown_80F561C
+_0805B134: .4byte gDungeonCamouflageTypes
_0805B138: .4byte gDungeonGlobalData
_0805B13C: .4byte 0x00003a0e
_0805B140: .4byte gUnknown_202DFE8
@@ -8082,7 +8082,7 @@ sub_805B668:
lsrs r0, 24
mov r9, r0
adds r0, r4, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
beq _0805B712
@@ -9266,7 +9266,7 @@ TrapbustOrbAction:
adds r0, r1, 0
bl sub_8045128
adds r4, r0, 0
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _0805BF78
@@ -9344,7 +9344,7 @@ _0805BFE0:
_0805BFF0:
adds r0, r6, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldr r4, [r0, 0x14]
cmp r4, 0
beq _0805C028
@@ -9458,7 +9458,7 @@ _0805C0BE:
adds r1, r4, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0805C0F2
@@ -9722,7 +9722,7 @@ FillInOrbAction:
movs r0, 0
mov r9, r0
ldr r5, [r7, 0x70]
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _0805C2DC
@@ -9770,7 +9770,7 @@ _0805C2DC:
ldrsh r0, [r0, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -9832,7 +9832,7 @@ _0805C372:
bl sub_80522F4
b _0805C3C0
.align 2, 0
-_0805C3A0: .4byte gUnknown_80F4448
+_0805C3A0: .4byte gAdjacentTileOffsets
_0805C3A4: .4byte 0xffff0000
_0805C3A8: .4byte 0x0000ffff
_0805C3AC: .4byte 0x0000fffc
@@ -9973,8 +9973,8 @@ sub_805C48C:
bx r1
thumb_func_end sub_805C48C
- thumb_func_start sub_805C498
-sub_805C498:
+ thumb_func_start CanUseWithStatusChecker
+CanUseWithStatusChecker:
push {r4-r6,lr}
adds r5, r0, 0
ldr r2, [r5, 0x70]
@@ -10397,7 +10397,7 @@ _0805C4C0:
.4byte _0805CDE8
_0805CB00:
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
b _0805CC5A
@@ -10426,7 +10426,7 @@ _0805CB24:
lsls r1, 1
adds r0, r2, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
ble _0805CB3E
b _0805CEA8
@@ -10552,10 +10552,10 @@ _0805CBF0:
adds r0, r1
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_8071858
+ bl HasType
b _0805CDEC
.align 2, 0
-_0805CC0C: .4byte gUnknown_80F561C
+_0805CC0C: .4byte gDungeonCamouflageTypes
_0805CC10: .4byte gDungeonGlobalData
_0805CC14: .4byte 0x00003a0e
_0805CC18:
@@ -10618,19 +10618,19 @@ _0805CC6E:
b _0805CB6E
_0805CC70:
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
b _0805CCAE
_0805CC7C:
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
b _0805CDB6
_0805CC88:
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
b _0805CCA0
@@ -10669,25 +10669,25 @@ _0805CCB6:
b _0805CDEE
_0805CCC2:
adds r0, r5, 0
- bl sub_8070B48
+ bl HasQuarterHPOrLess
lsls r0, 24
cmp r0, 0
beq _0805CCD0
b _0805CEA8
_0805CCD0:
adds r0, r5, 0
- bl sub_8070A58
+ bl HasNegativeStatus
b _0805CDC2
_0805CCD8:
adds r0, r5, 0
bl sub_8045128
- bl sub_804AF20
+ bl IsTileWater
b _0805CDEC
_0805CCE4:
adds r0, r5, 0
bl sub_8045128
adds r4, r0, 0
- bl sub_804AF20
+ bl IsTileWater
lsls r0, 24
cmp r0, 0
bne _0805CCF8
@@ -10808,7 +10808,7 @@ _0805CDB6:
b _0805CB6E
_0805CDBC:
adds r0, r5, 0x4
- bl sub_807FC80
+ bl CanLayTrap
_0805CDC2:
lsls r0, 24
_0805CDC4:
@@ -10837,7 +10837,7 @@ _0805CDE0:
bne _0805CEA8
b _0805CB6E
_0805CDE8:
- bl sub_80441BC
+ bl IsBossBattle
_0805CDEC:
lsls r0, 24
_0805CDEE:
@@ -10947,10 +10947,10 @@ _0805CEAA:
.align 2, 0
_0805CEB0: .4byte gDungeonGlobalData
_0805CEB4: .4byte 0x0001357c
- thumb_func_end sub_805C498
+ thumb_func_end CanUseWithStatusChecker
- thumb_func_start sub_805CEB8
-sub_805CEB8:
+ thumb_func_start CanUseWithStatusChecker_2
+CanUseWithStatusChecker_2:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -11370,7 +11370,7 @@ _0805CF00:
.4byte _0805D7F6
_0805D4F0:
adds r0, r6, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
b _0805D7A6
_0805D4FA:
@@ -11380,7 +11380,7 @@ _0805D4FA:
cmp r0, 0x4
beq _0805D540
adds r0, r6, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
b _0805D7A6
_0805D50E:
@@ -11422,7 +11422,7 @@ _0805D544:
lsls r3, 1
adds r4, r3
adds r0, r4, 0
- bl sub_805D810
+ bl HasDisabledMove
lsls r0, 24
cmp r0, 0
bne _0805D540
@@ -11446,7 +11446,7 @@ _0805D570:
movs r2, 0x8C
lsls r2, 1
adds r0, r4, r2
- bl sub_805D850
+ bl LastMoveOutOfPP
lsls r0, 24
b _0805D7A6
_0805D57E:
@@ -11723,7 +11723,7 @@ _0805D74A:
_0805D75C:
mov r0, r8
movs r1, 0xE
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0805D770
@@ -11773,7 +11773,7 @@ _0805D7AC:
lsls r2, 1
adds r0, r4, r2
_0805D7B2:
- bl sub_805D888
+ bl HasLastUsedMove
lsls r0, 24
_0805D7B8:
cmp r0, 0
@@ -11829,10 +11829,10 @@ _0805D804:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805CEB8
+ thumb_func_end CanUseWithStatusChecker_2
- thumb_func_start sub_805D810
-sub_805D810:
+ thumb_func_start HasDisabledMove
+HasDisabledMove:
push {r4-r6,lr}
adds r4, r0, 0
movs r3, 0
@@ -11869,10 +11869,10 @@ _0805D84A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805D810
+ thumb_func_end HasDisabledMove
- thumb_func_start sub_805D850
-sub_805D850:
+ thumb_func_start LastMoveOutOfPP
+LastMoveOutOfPP:
push {r4,r5,lr}
movs r3, 0
movs r5, 0x1
@@ -11903,10 +11903,10 @@ _0805D880:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805D850
+ thumb_func_end LastMoveOutOfPP
- thumb_func_start sub_805D888
-sub_805D888:
+ thumb_func_start HasLastUsedMove
+HasLastUsedMove:
push {r4-r6,lr}
adds r4, r0, 0
movs r3, 0
@@ -11943,7 +11943,7 @@ _0805D8C2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805D888
+ thumb_func_end HasLastUsedMove
thumb_func_start sub_805D8C8
sub_805D8C8:
@@ -11963,10 +11963,10 @@ sub_805D8C8:
movs r5, 0
movs r0, 0
strh r0, [r1, 0x12]
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x1
bl sub_806A2BC
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_80701A4
lsls r0, 24
cmp r0, 0
@@ -11999,16 +11999,16 @@ _0805D928:
cmp r0, 0
beq _0805D976
strb r5, [r1, 0x1]
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
bne _0805D976
movs r0, 0x1
bl sub_8044C10
bl sub_805E804
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_80647F0
bl ResetRepeatTimers
bl ResetUnusedInputStruct
@@ -12023,7 +12023,7 @@ _0805D976:
movs r2, 0x1
bl sub_806A914
_0805D980:
- bl sub_8083600
+ bl GetLeaderEntity
mov r10, r0
ldr r5, [r0, 0x70]
mov r8, r5
@@ -12282,7 +12282,7 @@ _0805DB7A:
lsls r0, 1
add r0, r8
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
beq _0805DBAA
b _0805D9EC
@@ -12307,7 +12307,7 @@ _0805DBBE:
lsls r0, 1
add r0, r8
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bne _0805DBDA
b _0805DD02
@@ -12327,7 +12327,7 @@ _0805DBF4: .4byte 0x00000673
_0805DBF8:
mov r0, r10
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _0805DC08
@@ -12949,7 +12949,7 @@ _0805E0C2:
mov r0, r10
adds r1, r5, 0
str r3, [sp, 0x20]
- bl sub_8070D6C
+ bl CannotMoveForward
lsls r0, 24
ldr r3, [sp, 0x20]
cmp r0, 0
@@ -13016,7 +13016,7 @@ _0805E14C:
lsls r0, 1
add r0, r8
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
beq _0805E188
mov r1, r10
@@ -13098,7 +13098,7 @@ _0805E1E0:
beq _0805E218
mov r0, r10
movs r1, 0
- bl sub_8045028
+ bl IsNotAttacking
lsls r0, 24
cmp r0, 0
bne _0805E2B0
@@ -13827,7 +13827,7 @@ _0805E7C6:
bl sub_806CDD4
b _0805E7F6
.align 2, 0
-_0805E7E8: .4byte gUnknown_80F4448
+_0805E7E8: .4byte gAdjacentTileOffsets
_0805E7EC:
movs r3, 0x1
add r8, r3
@@ -13911,7 +13911,7 @@ sub_805E874:
sub sp, 0x24
ldr r0, _0805E90C
ldr r4, [r0]
- bl sub_8083600
+ bl GetLeaderEntity
mov r9, r0
ldr r0, [r0, 0x70]
adds r0, 0x46
@@ -13976,7 +13976,7 @@ _0805E906:
b _0805EC1A
.align 2, 0
_0805E90C: .4byte gDungeonGlobalData
-_0805E910: .4byte gUnknown_80F4448
+_0805E910: .4byte gAdjacentTileOffsets
_0805E914: .4byte 0x0000066c
_0805E918:
ldrh r1, [r5]
@@ -14140,7 +14140,7 @@ _0805EA42:
beq _0805EA94
b _0805E906
.align 2, 0
-_0805EA54: .4byte gUnknown_80F4448
+_0805EA54: .4byte gAdjacentTileOffsets
_0805EA58: .4byte gDungeonGlobalData
_0805EA5C: .4byte 0x0001820f
_0805EA60:
@@ -14462,7 +14462,7 @@ _0805ECC2:
movs r0, 0x1
b _0805ECCE
.align 2, 0
-_0805ECC8: .4byte gUnknown_80F4448
+_0805ECC8: .4byte gAdjacentTileOffsets
_0805ECCC:
movs r0, 0
_0805ECCE:
@@ -14650,7 +14650,7 @@ sub_805EE30:
push {r4-r7,lr}
mov r7, r8
push {r7}
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
cmp r5, 0
bne _0805EE42
@@ -14878,7 +14878,7 @@ _0805EFF6:
bne _0805F008
mov r0, r8
adds r1, r4, 0
- bl sub_8070D6C
+ bl CannotMoveForward
lsls r0, 24
cmp r0, 0
beq _0805F014
@@ -14916,7 +14916,7 @@ sub_805F02C:
ldr r0, [r5]
adds r0, 0xBC
ldr r7, [r0]
- bl sub_8083600
+ bl GetLeaderEntity
mov r9, r0
ldr r0, [r7, 0x70]
mov r8, r0
@@ -15048,7 +15048,7 @@ _0805F12A:
bl sub_803F508
mov r0, r9
bl sub_8041AD0
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_8041AE0
ldr r0, _0805F198
adds r1, r7, 0
@@ -15078,7 +15078,7 @@ _0805F184:
pop {r0}
bx r0
.align 2, 0
-_0805F194: .4byte gUnknown_203B450
+_0805F194: .4byte gLeaderPokemon
_0805F198: .4byte gAvailablePokemonNames
_0805F19C: .4byte gUnknown_80F9BB0
thumb_func_end sub_805F02C
@@ -15146,12 +15146,12 @@ _0805F1F8:
_0805F208: .4byte gDungeonGlobalData
_0805F20C: .4byte 0x00000137
_0805F210:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x1
bl sub_806675C
b _0805F226
_0805F21C:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x1
bl sub_806684C
_0805F226:
@@ -15177,7 +15177,7 @@ _0805F240:
str r1, [r0]
ldr r0, [sp, 0xC]
bl DrawFieldMenu
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
ldr r4, _0805F38C
@@ -15274,7 +15274,7 @@ _0805F304:
ldr r1, _0805F3A4
ands r0, r1
str r0, [sp, 0x4]
- bl sub_8083600
+ bl GetLeaderEntity
add r1, sp, 0x4
bl sub_805FD74
lsls r0, 24
@@ -15289,7 +15289,7 @@ _0805F33A:
lsls r0, 24
cmp r0, 0
beq _0805F35C
- bl sub_8083600
+ bl GetLeaderEntity
add r1, sp, 0x4
bl sub_805FD74
lsls r0, 24
@@ -15303,7 +15303,7 @@ _0805F35C:
lsrs r0, 16
cmp r0, 0xC
bne _0805F3B2
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0xC
bl sub_8044D90
@@ -15331,36 +15331,36 @@ _0805F3A8:
_0805F3B2:
cmp r0, 0x35
bne _0805F3D0
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0xD
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048A68
b _0805F40A
_0805F3D0:
cmp r0, 0x10
bne _0805F3EE
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0xE
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048950
b _0805F40A
_0805F3EE:
cmp r0, 0x2C
bne _0805F41A
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0xF
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048B9C
_0805F40A:
@@ -15390,7 +15390,7 @@ _0805F428:
_0805F430:
movs r0, 0x1
bl sub_8044C10
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_8060E38
lsls r0, 24
cmp r0, 0
@@ -15567,7 +15567,7 @@ _0805F5A0:
ble _0805F57A
cmp r6, 0
bne _0805F5B0
- bl sub_8083600
+ bl GetLeaderEntity
adds r6, r0, 0
_0805F5B0:
adds r0, r6, 0
@@ -15733,10 +15733,10 @@ _0805F6FA:
bl sub_8063CF0
b _0805F56C
_0805F712:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
- bl sub_8083600
+ bl GetLeaderEntity
adds r0, 0x4
movs r1, 0
movs r2, 0x1
@@ -15756,7 +15756,7 @@ _0805F73A:
beq _0805F742
b _0805F8E0
_0805F742:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x4
ldrsh r2, [r0, r1]
movs r3, 0x6
@@ -15794,7 +15794,7 @@ _0805F768:
adds r1, 0x1
orrs r0, r1
str r0, [sp, 0x8]
- bl sub_8083600
+ bl GetLeaderEntity
add r4, sp, 0x8
adds r1, r4, 0
bl sub_805FD74
@@ -15804,7 +15804,7 @@ _0805F768:
lsls r0, 24
cmp r0, 0
beq _0805F7C2
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_805FD74
lsls r0, 24
@@ -15819,7 +15819,7 @@ _0805F7C2:
adds r1, r0, 0
cmp r0, 0xC
bne _0805F800
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0x10
bl sub_8044D90
@@ -15838,24 +15838,24 @@ _0805F7FC: .4byte 0x00ffffff
_0805F800:
cmp r0, 0x35
bne _0805F81E
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0x11
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048A68
b _0805F83A
_0805F81E:
cmp r0, 0x10
bne _0805F848
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0x12
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048950
_0805F83A:
@@ -15869,12 +15869,12 @@ _0805F840:
_0805F848:
cmp r1, 0x2C
bne _0805F8A8
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0x13
bl sub_8044D90
adds r4, r0, 0
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
bl sub_8048B9C
lsls r0, 24
@@ -15890,7 +15890,7 @@ _0805F872:
bne _0805F8CE
movs r0, 0x1
bl sub_8044C10
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_80643AC
b _0805F8A8
_0805F88C:
@@ -15903,7 +15903,7 @@ _0805F88C:
beq _0805F8B4
movs r0, 0x1
bl sub_8044C10
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_80647F0
_0805F8A8:
bl sub_805F1AC
@@ -15912,7 +15912,7 @@ _0805F8A8:
bne _0805F92A
b _0805F8CE
_0805F8B4:
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
ldr r0, _0805F8D8
movs r2, 0
@@ -15960,7 +15960,7 @@ _0805F904:
.align 2, 0
_0805F91C: .4byte gDungeonGlobalData
_0805F920:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
_0805F92A:
@@ -16022,9 +16022,9 @@ _0805F998:
_0805F9A0:
movs r0, 0
bl sub_80073B8
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _0805F9CC
@@ -16106,7 +16106,7 @@ _0805F9DA:
bne _0805FA62
b _0805FB92
_0805FA62:
- bl sub_8083600
+ bl GetLeaderEntity
ldr r7, [r0, 0x70]
bl sub_805317C
adds r5, r0, 0
@@ -16138,14 +16138,14 @@ _0805FA62:
lsls r1, 1
adds r0, r7, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
ldr r4, _0805FBC0
str r0, [r4]
movs r2, 0xA0
lsls r2, 1
adds r0, r7, r2
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
str r0, [r4, 0x4]
ldr r0, _0805FBC4
ldr r2, [r0]
@@ -16170,7 +16170,7 @@ _0805FA62:
bl xxx_format_and_draw
ldr r5, _0805FBD0
movs r0, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -17607,7 +17607,7 @@ _080606B0:
ldr r0, _0806070C
ldr r1, [sp, 0x74]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _08060710
ldr r2, [r0]
mov r4, r8
@@ -17667,7 +17667,7 @@ _08060718:
adds r7, 0x60
ldr r0, _080607EC
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _080607F0
ldr r2, [r0]
movs r4, 0
@@ -18395,7 +18395,7 @@ _08060D20: .4byte gUnknown_202F238
thumb_func_start sub_8060D24
sub_8060D24:
push {r4,lr}
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
movs r2, 0xB
bl sub_8044D90
@@ -18874,7 +18874,7 @@ _08061100: .4byte gRealInputs
_08061104: .4byte gUnknown_202EE39
_08061108: .4byte gUnknown_202EE10
_0806110C:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
_08061116:
@@ -18914,7 +18914,7 @@ DrawFieldTeamMenu:
movs r1, 0x1
_08061154:
mov r10, r1
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
add r0, sp, 0x4
bl sub_8069D18
@@ -21007,7 +21007,7 @@ _0806220C:
movs r1, 0
bl sub_803EAF0
ldr r0, [sp, 0x110]
- bl sub_807191C
+ bl LoadIQSkills
add sp, 0x130
pop {r3-r5}
mov r8, r3
@@ -22101,7 +22101,7 @@ _08062AF4:
movs r0, 0x1B
bl sub_803E46C
bl sub_804AA60
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
movs r0, 0
@@ -22248,7 +22248,7 @@ _08062C24:
mov r0, r10
adds r1, r5, 0
movs r2, 0x1
- bl sub_80573CC
+ bl IsMoveUsable_2
add r1, sp, 0x4
movs r2, 0
lsls r0, 24
@@ -22693,7 +22693,7 @@ sub_8062F90:
str r2, [sp, 0xD8]
ldr r0, [r0, 0x70]
mov r9, r0
- bl sub_8083600
+ bl GetLeaderEntity
ldr r0, [r0, 0x70]
str r0, [sp, 0xE4]
add r4, sp, 0x70
@@ -23330,7 +23330,7 @@ _0806343E:
ldr r0, _08063518
adds r1, r7, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
movs r3, 0
movs r5, 0x1
_080634DE:
@@ -23482,7 +23482,7 @@ _08063606:
ldr r0, [sp, 0x14]
adds r1, r5, 0
movs r2, 0x1
- bl sub_80573CC
+ bl IsMoveUsable_2
add r1, sp, 0x4
movs r2, 0
lsls r0, 24
@@ -23659,7 +23659,7 @@ _0806376A:
bgt _08063788
mov r0, r8
movs r2, 0x1
- bl sub_8057348
+ bl IsMoveUsable
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -25125,7 +25125,7 @@ _08064262:
mov r7, r9
ldr r1, [r7, 0x70]
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
str r4, [sp]
str r4, [sp, 0x4]
mov r0, r8
@@ -26332,7 +26332,7 @@ _08064C6A:
ldrb r0, [r0]
cmp r0, 0
beq _08064CA4
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _08064CA4
@@ -26401,7 +26401,7 @@ _08064D06:
ldrb r0, [r0]
cmp r0, 0
beq _08064D2A
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _08064D2A
@@ -27034,7 +27034,7 @@ sub_80651FC:
movs r1, 0x2E
bl SetAction
ldr r4, _0806523C
- bl sub_8083600
+ bl GetLeaderEntity
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0
@@ -27219,7 +27219,7 @@ _080652D2:
ldrb r0, [r0]
cmp r0, 0
beq _0806540E
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _080653F4
@@ -29380,7 +29380,7 @@ _08066530:
_08066554:
adds r0, r2, r6
str r3, [sp, 0x1BC]
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
add r0, sp
@@ -30824,7 +30824,7 @@ sub_8067110:
ldr r0, _08067194
adds r1, r4, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r5, 0
adds r1, r6, 0
bl sub_8048D50
@@ -30935,7 +30935,7 @@ _0806721C: .4byte gUnknown_80F8BE0
_08067220:
adds r0, r6, 0
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _08067248
@@ -31113,7 +31113,7 @@ _08067384:
ldr r0, _080673B4
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldrb r0, [r4, 0x2]
bl GetItemType
lsls r0, 24
@@ -31322,7 +31322,7 @@ sub_806752C:
adds r1, r2
adds r1, r0
ldr r4, [r1]
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
movs r2, 0
bl sub_8067558
@@ -31371,7 +31371,7 @@ _08067594:
adds r1, r5, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -31382,7 +31382,7 @@ _080675AA:
adds r1, r6, 0
movs r2, 0x1
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -31394,12 +31394,12 @@ _080675C0:
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r4, 0x50
adds r0, r4, 0
mov r1, r8
movs r2, 0x7
- bl sub_80708B4
+ bl SetMessageArgument_2
bl sub_8084778
adds r0, r6, 0
adds r1, r5, 0
@@ -31611,7 +31611,7 @@ sub_8067768:
adds r1, r2
adds r1, r0
ldr r4, [r1]
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r4, 0
movs r2, 0
bl sub_8067794
@@ -31977,7 +31977,7 @@ _08067A56:
_08067A68: .4byte 0x00000159
_08067A6C: .4byte gUnknown_202F208
_08067A70: .4byte gUnknown_80FC690
-_08067A74: .4byte gUnknown_80F4448
+_08067A74: .4byte gAdjacentTileOffsets
_08067A78: .4byte 0xffff0000
_08067A7C: .4byte 0x0000ffff
thumb_func_end sub_8067904
@@ -33488,7 +33488,7 @@ _08068664:
_08068690:
ldr r0, [r6]
adds r0, r5
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
movs r1, 0x1
@@ -34645,7 +34645,7 @@ _08068F74:
thumb_func_start sub_8068F80
sub_8068F80:
push {r4,r5,lr}
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
ldr r0, _08068FD4
ldr r4, [r0]
@@ -34823,7 +34823,7 @@ _080690A2:
_080690E4: .4byte gDungeonGlobalData
_080690E8: .4byte 0x000135cc
_080690EC: .4byte 0x000037fc
-_080690F0: .4byte gUnknown_203B450
+_080690F0: .4byte gLeaderPokemon
_080690F4: .4byte 0x0000065c
_080690F8: .4byte 0x000005f4
_080690FC:
@@ -35110,7 +35110,7 @@ _08069338:
movs r2, 0
bl SetMessageArgument
_08069352:
- bl sub_8083600
+ bl GetLeaderEntity
cmp r0, 0
beq _080693C6
movs r0, 0x87
@@ -35145,7 +35145,7 @@ _08069384:
lsrs r0, 16
cmp r0, 0x2
bhi _080693C6
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _080693C6
@@ -35278,7 +35278,7 @@ _080694AC: .4byte 0x00008df8
_080694B0: .4byte 0x00000644
_080694B4: .4byte 0x0000065c
_080694B8: .4byte 0x0000fffd
-_080694BC: .4byte gUnknown_203B450
+_080694BC: .4byte gLeaderPokemon
thumb_func_end sub_8068FE0
thumb_func_start sub_80694C0
@@ -35296,7 +35296,7 @@ sub_80694C0:
mov r9, r3
adds r0, r7, 0
mov r1, r8
- bl sub_8049590
+ bl GetMapEntity
mov r10, r0
ldr r5, [r4, 0x70]
adds r6, r5, 0
@@ -35343,7 +35343,7 @@ _08069522:
blt _08069552
adds r1, r0, 0
adds r0, r2, 0
- bl sub_8049590
+ bl GetMapEntity
adds r1, r0, 0
ldr r0, [r1, 0x10]
cmp r0, r4
@@ -35538,7 +35538,7 @@ _0806969E:
pop {r1}
bx r1
.align 2, 0
-_080696A4: .4byte gUnknown_80F4448
+_080696A4: .4byte gAdjacentTileOffsets
thumb_func_end sub_8069660
thumb_func_start sub_80696A8
@@ -35550,7 +35550,7 @@ sub_80696A8:
adds r5, 0x46
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_8071138
+ bl CanAttackInFront
lsls r0, 24
cmp r0, 0
beq _080696F4
@@ -35578,7 +35578,7 @@ sub_80696A8:
adds r0, r1, 0
b _080696F6
.align 2, 0
-_080696F0: .4byte gUnknown_80F4448
+_080696F0: .4byte gAdjacentTileOffsets
_080696F4:
movs r0, 0
_080696F6:
@@ -35640,7 +35640,7 @@ sub_80696FC:
adds r0, r1, 0
b _08069772
.align 2, 0
-_08069764: .4byte gUnknown_80F4448
+_08069764: .4byte gAdjacentTileOffsets
_08069768: .4byte 0xffff0000
_0806976C: .4byte 0x0000ffff
_08069770:
@@ -35738,7 +35738,7 @@ sub_806977C:
adds r0, r1, 0
b _0806983A
.align 2, 0
-_0806982C: .4byte gUnknown_80F4448
+_0806982C: .4byte gAdjacentTileOffsets
_08069830: .4byte 0xffff0000
_08069834: .4byte 0x0000ffff
_08069838:
@@ -35761,7 +35761,7 @@ sub_8069844:
adds r0, r6, 0x2
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldrh r0, [r5, 0x2]
strh r0, [r6]
movs r1, 0xE
@@ -35982,7 +35982,7 @@ _08069A02:
lsls r1, 1
adds r0, r5, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bne _08069A38
ldrb r0, [r5, 0x7]
@@ -36428,7 +36428,7 @@ sub_8069D18:
pop {r1}
bx r1
.align 2, 0
-_08069D48: .4byte gUnknown_80F4448
+_08069D48: .4byte gAdjacentTileOffsets
thumb_func_end sub_8069D18
thumb_func_start sub_8069D4C
@@ -36500,8 +36500,8 @@ _08069D6C:
bx r0
thumb_func_end sub_8069D4C
- thumb_func_start sub_8069DCC
-sub_8069DCC:
+ thumb_func_start TargetTileInFront
+TargetTileInFront:
push {r4,lr}
ldr r1, [r0, 0x70]
mov r12, r1
@@ -36532,8 +36532,8 @@ sub_8069DCC:
pop {r0}
bx r0
.align 2, 0
-_08069E08: .4byte gUnknown_80F4448
- thumb_func_end sub_8069DCC
+_08069E08: .4byte gAdjacentTileOffsets
+ thumb_func_end TargetTileInFront
thumb_func_start sub_8069E0C
sub_8069E0C:
@@ -36546,7 +36546,7 @@ sub_8069E0C:
cmp r0, 0
beq _08069E44
adds r0, r4, 0
- bl sub_807E580
+ bl GetWeather
ldr r1, _08069E40
lsls r0, 24
lsrs r0, 22
@@ -36602,8 +36602,8 @@ _08069E64:
_08069E88: .4byte gDungeonGlobalData
thumb_func_end sub_8069E0C
- thumb_func_start sub_8069E8C
-sub_8069E8C:
+ thumb_func_start TriggerWeatherAbilities
+TriggerWeatherAbilities:
push {r4-r7,lr}
ldr r3, _08069ED8
ldr r2, [r3]
@@ -36700,7 +36700,7 @@ _08069F44:
.align 2, 0
_08069F4C: .4byte 0x0000e270
_08069F50: .4byte 0x0000e279
- thumb_func_end sub_8069E8C
+ thumb_func_end TriggerWeatherAbilities
thumb_func_start sub_8069F54
sub_8069F54:
@@ -36721,7 +36721,7 @@ sub_8069F54:
beq _08069F90
ldr r4, _08069F8C
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 22
adds r0, r4
@@ -36863,7 +36863,7 @@ _0806A068:
beq _0806A0FA
mov r0, r8
mov r1, r9
- bl sub_8071A1C
+ bl GetMoveType_2
lsls r0, 24
lsrs r5, r0, 24
mov r1, r9
@@ -36871,7 +36871,7 @@ _0806A068:
cmp r0, 0x1F
bne _0806A0AA
mov r0, r8
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
ldr r1, _0806A114
@@ -36882,7 +36882,7 @@ _0806A0AA:
beq _0806A0FA
adds r0, r6, 0
adds r1, r5, 0
- bl sub_8071858
+ bl HasType
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -36954,7 +36954,7 @@ sub_806A120:
bne _0806A19C
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8071A1C
+ bl GetMoveType_2
lsls r0, 24
lsrs r0, 24
bl sub_8092364
@@ -37380,7 +37380,7 @@ _0806A488:
movs r2, 0x6
ldrsh r1, [r6, r2]
adds r1, r7
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
ldr r0, [r4, 0x10]
cmp r0, 0
@@ -37612,7 +37612,7 @@ _0806A608:
bl sub_8076210
b _0806A6D2
.align 2, 0
-_0806A640: .4byte gUnknown_810ACC0
+_0806A640: .4byte gDungeonWaterType
_0806A644: .4byte gDungeonGlobalData
_0806A648: .4byte 0x00003a0e
_0806A64C: .4byte 0x00000113
@@ -37646,11 +37646,11 @@ _0806A664:
movs r1, 0
mov r8, r1
adds r0, r5, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x13
ble _0806A6A4
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x13
bgt _0806A6A4
ldr r0, _0806A6E0
@@ -37658,14 +37658,14 @@ _0806A664:
mov r8, r0
_0806A6A4:
adds r0, r5, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x9
ble _0806A6C4
movs r2, 0x9E
lsls r2, 1
adds r0, r7, r2
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x9
bgt _0806A6C4
ldr r0, _0806A6E4
@@ -37844,7 +37844,7 @@ sub_806A7E8:
ldr r0, _0806A828
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
movs r2, 0x1
mov r8, r4
_0806A818:
@@ -38411,7 +38411,7 @@ _0806AC34:
beq _0806AC72
_0806AC50:
adds r0, r4, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
bne _0806AC66
@@ -38557,10 +38557,10 @@ sub_806AD3C:
adds r7, r0, 0
_0806AD66:
adds r0, r6, 0
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
strh r0, [r4]
adds r0, r6, 0
- bl sub_808E9E4
+ bl ExtractLevel
strh r0, [r4, 0x2]
adds r0, r4, 0x4
movs r2, 0
@@ -38665,7 +38665,7 @@ _0806AE30:
adds r6, r3, 0
_0806AE42:
adds r0, r5, 0
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r4, r0, 16
ldr r1, _0806AECC
@@ -38677,7 +38677,7 @@ _0806AE42:
cmp r0, 0
bne _0806AE72
adds r0, r5, 0
- bl sub_808E9E4
+ bl ExtractLevel
adds r1, r0, 0
adds r0, r4, 0
bl CalculateEXPGain
@@ -39020,7 +39020,7 @@ _0806B0EE:
bge _0806B106
lsls r0, r4, 3
add r0, r8
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
lsls r0, 16
asrs r0, 16
movs r2, 0xE
@@ -39479,7 +39479,7 @@ _0806B460:
movs r0, 0
mov r2, r9
str r0, [r2]
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
bl EntityExists
lsls r0, 24
@@ -39490,7 +39490,7 @@ _0806B460:
ldrh r4, [r5, 0x4]
b _0806B4AE
.align 2, 0
-_0806B480: .4byte gUnknown_203B450
+_0806B480: .4byte gLeaderPokemon
_0806B484: .4byte gRecruitedPokemonRef
_0806B488: .4byte 0x000055aa
_0806B48C: .4byte 0x00008df8
@@ -40317,7 +40317,7 @@ _0806BA72:
ldrb r0, [r0]
cmp r0, 0
beq _0806BB24
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _0806BB24
@@ -40354,7 +40354,7 @@ _0806BB24:
ldr r0, [sp, 0x1C]
bl sub_806A6E8
ldr r0, [sp, 0x1C]
- bl sub_807191C
+ bl LoadIQSkills
ldr r3, [sp, 0x4C]
cmp r3, 0
beq _0806BB3A
@@ -40372,12 +40372,12 @@ _0806BB3C:
pop {r1}
bx r1
.align 2, 0
-_0806BB4C: .4byte gUnknown_80F4448
+_0806BB4C: .4byte gAdjacentTileOffsets
_0806BB50: .4byte gUnknown_202F32C
_0806BB54: .4byte 0xffff0000
_0806BB58: .4byte 0x0000ffff
_0806BB5C: .4byte gUnknown_202EE0C
-_0806BB60: .4byte gUnknown_203B450
+_0806BB60: .4byte gLeaderPokemon
_0806BB64: .4byte gDungeonGlobalData
_0806BB68: .4byte 0x00000644
thumb_func_end sub_806B8CC
@@ -40856,7 +40856,7 @@ _0806BE12:
adds r0, r6, r1
strb r7, [r0]
mov r0, r8
- bl sub_8070774
+ bl GetMovementSpeed
movs r2, 0xAB
lsls r2, 1
adds r1, r6, r2
@@ -40903,7 +40903,7 @@ _0806BF70:
ldrb r3, [r3]
bl sub_800F8D0
mov r0, r8
- bl sub_807191C
+ bl LoadIQSkills
mov r0, r8
movs r1, 0
movs r2, 0
@@ -41125,7 +41125,7 @@ _0806C11E:
cmp r1, 0
beq _0806C170
movs r0, 0
- bl sub_807E580
+ bl GetWeather
ldr r1, _0806C16C
lsls r0, 24
lsrs r0, 22
@@ -43058,7 +43058,7 @@ sub_806CF98:
_0806CFBE:
cmp r5, 0x1
bne _0806CFCE
- bl sub_804AF74
+ bl IsWaterTileset
lsls r0, 24
cmp r0, 0
beq _0806CFEE
@@ -43092,7 +43092,7 @@ _0806CFF8:
pop {r1}
bx r1
.align 2, 0
-_0806D000: .4byte gUnknown_810ACC0
+_0806D000: .4byte gDungeonWaterType
_0806D004: .4byte gDungeonGlobalData
_0806D008: .4byte 0x00003a0e
_0806D00C: .4byte gUnknown_8106EEF
@@ -43425,7 +43425,7 @@ _0806D26C:
beq _0806D2C2
adds r0, r6, 0
movs r1, 0xA
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _0806D2C2
@@ -43479,7 +43479,7 @@ _0806D2EE:
beq _0806D328
adds r0, r6, 0
movs r1, 0x11
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0806D328
@@ -43773,7 +43773,7 @@ _0806D55C:
bl sub_807A96C
mov r0, r9
adds r1, r7, 0
- bl sub_806F450
+ bl SetShopkeeperAggression
mov r0, r9
bl GetEntityType
cmp r0, 0x1
@@ -44196,7 +44196,7 @@ _0806D8C8:
strb r0, [r4]
_0806D8E0:
adds r0, r7, 0
- bl sub_8069DCC
+ bl TargetTileInFront
_0806D8E6:
ldr r0, [r7, 0x70]
adds r0, 0x46
@@ -45404,7 +45404,7 @@ _0806E26C:
cmp r7, 0x2
bne _0806E2A0
ldr r0, [sp, 0x18]
- bl sub_807723C
+ bl GetFlashFireStatus
lsls r0, 24
cmp r0, 0
beq _0806E2A0
@@ -45477,7 +45477,7 @@ _0806E300:
ldr r0, [sp, 0x24]
movs r1, 0x80
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r5, r0, 24
cmp r4, 0
@@ -45531,7 +45531,7 @@ _0806E36E:
ldr r0, [sp, 0x24]
movs r1, 0x2
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r5, r0, 24
cmp r4, 0
@@ -45584,7 +45584,7 @@ _0806E3DA:
ldr r0, [sp, 0x24]
movs r1, 0x10
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r5, r0, 24
cmp r4, 0
@@ -45638,7 +45638,7 @@ _0806E448:
ldr r0, [sp, 0x24]
movs r1, 0x20
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r5, r0, 24
cmp r4, 0
@@ -45671,7 +45671,7 @@ _0806E486:
bne _0806E4B8
mov r0, r8
adds r1, r7, 0
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0806E4B8
@@ -45688,7 +45688,7 @@ _0806E486:
bl sub_800A34C
_0806E4B8:
mov r0, r8
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -45707,7 +45707,7 @@ _0806E4B8:
bl sub_800A34C
b _0806E53E
.align 2, 0
-_0806E4E4: .4byte gUnknown_80F522C
+_0806E4E4: .4byte gTypeEffectivenessChart
_0806E4E8: .4byte gDungeonGlobalData
_0806E4EC: .4byte gUnknown_8106F54
_0806E4F0: .4byte gUnknown_80F54B4
@@ -45867,8 +45867,8 @@ _0806E64C: .4byte 0x00000177
_0806E650: .4byte gUnknown_8106F0C
thumb_func_end sub_806E100
- thumb_func_start sub_806E654
-sub_806E654:
+ thumb_func_start WeightWeakTypePicker
+WeightWeakTypePicker:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -45904,7 +45904,7 @@ _0806E686:
cmp r4, 0x2
bne _0806E6A2
ldr r0, [sp, 0x14]
- bl sub_807723C
+ bl GetFlashFireStatus
lsls r0, 24
cmp r0, 0
bne _0806E6C6
@@ -45977,7 +45977,7 @@ _0806E6F0:
strb r0, [r1]
b _0806E73E
.align 2, 0
-_0806E724: .4byte gUnknown_8106F6C
+_0806E724: .4byte gTypeEffectivenessMultipliers
_0806E728: .4byte gDungeonGlobalData
_0806E72C: .4byte 0x00000179
_0806E730:
@@ -46114,14 +46114,14 @@ _0806E824:
beq _0806E84E
mov r0, r9
adds r1, r4, 0
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0806E838
lsls r5, 1
_0806E838:
mov r0, r9
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -46134,7 +46134,7 @@ _0806E84E:
movs r0, 0x2
b _0806E894
.align 2, 0
-_0806E854: .4byte gUnknown_80F522C
+_0806E854: .4byte gTypeEffectivenessChart
_0806E858:
lsls r5, 1
_0806E85A:
@@ -46184,7 +46184,7 @@ _0806E894:
_0806E8A4: .4byte gDungeonGlobalData
_0806E8A8: .4byte 0x0000e277
_0806E8AC: .4byte 0x0000e278
- thumb_func_end sub_806E654
+ thumb_func_end WeightWeakTypePicker
thumb_func_start sub_806E8B0
sub_806E8B0:
@@ -46223,14 +46223,14 @@ _0806E8E6:
beq _0806E92C
ldr r5, [r6, 0x70]
adds r0, r6, 0
- bl sub_8070A58
+ bl HasNegativeStatus
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r0, 24
cmp r4, 0
@@ -46274,7 +46274,7 @@ _0806E95A:
lsls r1, 1
adds r0, r2, 0
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r1, r0, 24
cmp r4, 0
@@ -46392,14 +46392,14 @@ _0806EA38:
bne _0806EA90
mov r0, r9
ldr r5, [r0, 0x70]
- bl sub_8070A58
+ bl HasNegativeStatus
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x8
adds r2, r4, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r1, r0, 24
cmp r4, 0
@@ -46514,7 +46514,7 @@ _0806EB3A:
lsls r0, 1
add r0, r10
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r1, r0, 0
cmp r1, 0
bne _0806EB72
@@ -47131,7 +47131,7 @@ _0806F036:
cmp r2, 0x2
bne _0806F0BC
mov r0, r9
- bl sub_807723C
+ bl GetFlashFireStatus
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -47582,7 +47582,7 @@ _0806F3FC:
movs r0, 0x1
b _0806F414
.align 2, 0
-_0806F408: .4byte gUnknown_80F522C
+_0806F408: .4byte gTypeEffectivenessChart
_0806F40C: .4byte gUnknown_80F54B4
_0806F410:
add r1, sp, 0x10
@@ -47620,8 +47620,8 @@ _0806F440:
bx r0
thumb_func_end sub_806F370
- thumb_func_start sub_806F450
-sub_806F450:
+ thumb_func_start SetShopkeeperAggression
+SetShopkeeperAggression:
push {r4-r6,lr}
adds r5, r0, 0
ldr r4, [r1, 0x70]
@@ -47647,7 +47647,7 @@ _0806F47A:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_806F450
+ thumb_func_end SetShopkeeperAggression
thumb_func_start sub_806F480
sub_806F480:
@@ -47679,7 +47679,7 @@ sub_806F4A4:
lsrs r4, r1, 24
ldr r5, [r0, 0x70]
movs r1, 0xE
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0806F4CE
@@ -47723,7 +47723,7 @@ _0806F4F6:
pop {r1}
bx r1
.align 2, 0
-_0806F4FC: .4byte gUnknown_80F522C
+_0806F4FC: .4byte gTypeEffectivenessChart
thumb_func_end sub_806F4A4
thumb_func_start sub_806F500
diff --git a/asm/code_807001C.s b/asm/code_807001C.s
index 27c2707..96457c9 100644
--- a/asm/code_807001C.s
+++ b/asm/code_807001C.s
@@ -64,7 +64,7 @@ _0807007A:
bl SendMessage
b _0807019C
.align 2, 0
-_08070088: .4byte gUnknown_80F954C
+_08070088: .4byte gFrozenMessage
_0807008C:
ldr r0, _08070098
ldr r1, [r0]
@@ -72,7 +72,7 @@ _0807008C:
bl SendMessage
b _0807019C
.align 2, 0
-_08070098: .4byte gUnknown_80F956C
+_08070098: .4byte gWrappedAroundMessage
_0807009C:
ldr r0, _080700A8
ldr r1, [r0]
@@ -80,7 +80,7 @@ _0807009C:
bl SendMessage
b _0807019C
.align 2, 0
-_080700A8: .4byte gUnknown_80F958C
+_080700A8: .4byte gWrappedByMessage
_080700AC:
adds r0, r4, 0
adds r0, 0xBC
@@ -100,7 +100,7 @@ _080700AC:
bl SendMessage
b _0807019C
.align 2, 0
-_080700D0: .4byte gUnknown_80F95D8
+_080700D0: .4byte gBideMessage
_080700D4:
ldr r0, _080700E0
ldr r1, [r0]
@@ -108,7 +108,7 @@ _080700D4:
bl SendMessage
b _0807019C
.align 2, 0
-_080700E0: .4byte gUnknown_80F95A4
+_080700E0: .4byte gPausedMessage
_080700E4:
ldr r0, _080700F0
ldr r1, [r0]
@@ -116,7 +116,7 @@ _080700E4:
bl SendMessage
b _0807019C
.align 2, 0
-_080700F0: .4byte gUnknown_80F95BC
+_080700F0: .4byte gInfatuatedMessage
_080700F4:
adds r0, r4, 0
adds r0, 0xC8
@@ -158,7 +158,7 @@ _0807012E:
adds r6, 0x46
ldrb r1, [r6]
adds r0, r5, 0
- bl sub_8070D6C
+ bl CannotMoveForward
lsls r0, 24
cmp r0, 0
bne _08070166
@@ -261,17 +261,17 @@ _08070202:
ldr r0, _08070208
b _08070278
.align 2, 0
-_08070208: .4byte gUnknown_80F954C
+_08070208: .4byte gFrozenMessage
_0807020C:
ldr r0, _08070210
b _08070278
.align 2, 0
-_08070210: .4byte gUnknown_80F956C
+_08070210: .4byte gWrappedAroundMessage
_08070214:
ldr r0, _08070218
b _08070278
.align 2, 0
-_08070218: .4byte gUnknown_80F958C
+_08070218: .4byte gWrappedByMessage
_0807021C:
adds r0, r6, 0
adds r0, 0xBC
@@ -303,12 +303,12 @@ _0807025C:
ldr r0, _08070260
b _08070278
.align 2, 0
-_08070260: .4byte gUnknown_80F95A4
+_08070260: .4byte gPausedMessage
_08070264:
ldr r0, _08070268
b _08070278
.align 2, 0
-_08070268: .4byte gUnknown_80F95BC
+_08070268: .4byte gInfatuatedMessage
_0807026C:
adds r0, r6, 0
adds r0, 0xC0
@@ -324,7 +324,7 @@ _08070280:
movs r0, 0x1
b _08070322
.align 2, 0
-_08070284: .4byte gUnknown_80F95D8
+_08070284: .4byte gBideMessage
_08070288:
cmp r0, 0
beq _08070320
@@ -412,8 +412,8 @@ _08070322:
bx r1
thumb_func_end sub_80701A4
- thumb_func_start sub_8070328
-sub_8070328:
+ thumb_func_start GetCrossableTerrain
+GetCrossableTerrain:
push {lr}
lsls r0, 16
asrs r0, 16
@@ -433,7 +433,7 @@ _08070344:
bx r1
.align 2, 0
_08070348: .4byte gUnknown_202F314
- thumb_func_end sub_8070328
+ thumb_func_end GetCrossableTerrain
thumb_func_start sub_807034C
sub_807034C:
@@ -450,7 +450,7 @@ sub_807034C:
cmp r0, 0
bne _08070398
adds r0, r2, 0
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r2, r0, 24
ldrh r0, [r4]
@@ -519,7 +519,7 @@ sub_80703A0:
ands r0, r1
cmp r0, 0
bne _08070456
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070400
@@ -537,7 +537,7 @@ sub_80703A0:
_08070400:
movs r1, 0x2
ldrsh r0, [r7, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r4, r0, 24
ldrh r0, [r5]
@@ -590,8 +590,8 @@ _08070458:
bx r1
thumb_func_end sub_80703A0
- thumb_func_start sub_8070460
-sub_8070460:
+ thumb_func_start CanCrossWalls
+CanCrossWalls:
push {r4,lr}
adds r1, r0, 0
ldr r0, [r1, 0x70]
@@ -608,7 +608,7 @@ sub_8070460:
bne _08070492
movs r1, 0x2
ldrsh r0, [r4, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -621,7 +621,7 @@ _08070494:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8070460
+ thumb_func_end CanCrossWalls
thumb_func_start sub_807049C
sub_807049C:
@@ -659,7 +659,7 @@ sub_807049C:
cmp r0, 0x1
bne _0807055A
_080704E2:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070504
@@ -677,7 +677,7 @@ _080704E2:
_08070504:
movs r1, 0x2
ldrsh r0, [r7, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r4, r0, 24
ldrh r0, [r5]
@@ -767,7 +767,7 @@ sub_8070564:
_080705A8:
movs r1, 0x2
ldrsh r0, [r6, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r2, r0, 24
adds r3, r2, 0
@@ -843,7 +843,7 @@ sub_80705F0:
cmp r0, 0x1
bne _0807069A
_08070636:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070658
@@ -861,7 +861,7 @@ _08070636:
_08070658:
movs r1, 0x2
ldrsh r0, [r7, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r4, r0, 24
ldrh r0, [r5]
@@ -940,7 +940,7 @@ sub_80706A4:
cmp r0, r6
bne _0807076A
_080706F2:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070714
@@ -958,7 +958,7 @@ _080706F2:
_08070714:
movs r1, 0x2
ldrsh r0, [r6, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r4, r0, 24
ldrh r0, [r5]
@@ -1011,8 +1011,8 @@ _0807076C:
bx r1
thumb_func_end sub_80706A4
- thumb_func_start sub_8070774
-sub_8070774:
+ thumb_func_start GetMovementSpeed
+GetMovementSpeed:
push {r4-r6,lr}
adds r6, r0, 0
ldr r5, [r6, 0x70]
@@ -1049,12 +1049,12 @@ _080707A8:
adds r4, r0
adds r0, r6, 0
movs r1, 0x6
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _080707D0
adds r0, r6, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x7
@@ -1106,7 +1106,7 @@ _0807080A:
_0807081C: .4byte 0x000001a3
_08070820: .4byte gDungeonGlobalData
_08070824: .4byte 0x0000066e
- thumb_func_end sub_8070774
+ thumb_func_end GetMovementSpeed
thumb_func_start sub_8070828
sub_8070828:
@@ -1129,7 +1129,7 @@ _08070840:
cmp r0, 0
beq _0807085E
adds r0, r4, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -1143,7 +1143,7 @@ _0807085E:
cmp r0, 0
beq _0807087C
adds r0, r4, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1155,7 +1155,7 @@ _0807087C:
ldr r0, [r4, 0x70]
movs r1, 0x40
adds r2, r5, 0
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
cmp r0, 0
beq _080708A0
@@ -1180,8 +1180,8 @@ _080708AE:
bx r1
thumb_func_end sub_8070828
- thumb_func_start sub_80708B4
-sub_80708B4:
+ thumb_func_start SetMessageArgument_2
+SetMessageArgument_2:
push {r4,r5,lr}
adds r3, r0, 0
adds r4, r2, 0
@@ -1271,7 +1271,7 @@ _0807095A:
.align 2, 0
_08070960: .4byte gRecruitedPokemonRef
_08070964: .4byte 0x00008df8
- thumb_func_end sub_80708B4
+ thumb_func_end SetMessageArgument_2
thumb_func_start sub_8070968
sub_8070968:
@@ -1397,8 +1397,8 @@ _08070A50: .4byte gRecruitedPokemonRef
_08070A54: .4byte 0x00008df8
thumb_func_end sub_80709C8
- thumb_func_start sub_8070A58
-sub_8070A58:
+ thumb_func_start HasNegativeStatus
+HasNegativeStatus:
push {r4,lr}
ldr r0, [r0, 0x70]
mov r12, r0
@@ -1510,10 +1510,10 @@ _08070B1E:
bx r1
.align 2, 0
_08070B24: .4byte 0x0000010d
- thumb_func_end sub_8070A58
+ thumb_func_end HasNegativeStatus
- thumb_func_start sub_8070B28
-sub_8070B28:
+ thumb_func_start IsSleeping
+IsSleeping:
push {lr}
ldr r0, [r0, 0x70]
adds r0, 0xA8
@@ -1531,10 +1531,10 @@ _08070B40:
_08070B42:
pop {r1}
bx r1
- thumb_func_end sub_8070B28
+ thumb_func_end IsSleeping
- thumb_func_start sub_8070B48
-sub_8070B48:
+ thumb_func_start HasQuarterHPOrLess
+HasQuarterHPOrLess:
push {lr}
ldr r0, [r0, 0x70]
adds r1, r0, 0
@@ -1556,6 +1556,6 @@ _08070B66:
_08070B68:
pop {r1}
bx r1
- thumb_func_end sub_8070B48
+ thumb_func_end HasQuarterHPOrLess
.align 2, 0
diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s
index 43fc95e..cc3c9f2 100644
--- a/asm/code_8070D04.s
+++ b/asm/code_8070D04.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8070D04
-sub_8070D04:
+ thumb_func_start CannotAttack
+CannotAttack:
push {lr}
adds r3, r0, 0
lsls r1, 24
@@ -60,17 +60,17 @@ _08070D64:
_08070D66:
pop {r1}
bx r1
- thumb_func_end sub_8070D04
+ thumb_func_end CannotAttack
- thumb_func_start sub_8070D6C
-sub_8070D6C:
+ thumb_func_start CannotMoveForward
+CannotMoveForward:
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r5, r0, 24
movs r2, 0x4
@@ -96,7 +96,7 @@ sub_8070D6C:
ldr r0, [r2, 0x10]
cmp r0, 0
bne _08070E34
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070E04
@@ -115,7 +115,7 @@ _08070DD2:
movs r5, 0x3
b _08070E04
.align 2, 0
-_08070DD8: .4byte gUnknown_80F4448
+_08070DD8: .4byte gAdjacentTileOffsets
_08070DDC:
adds r0, r4, 0
movs r1, 0xC
@@ -158,14 +158,14 @@ _08070E04:
movs r0, 0x1
b _08070E36
.align 2, 0
-_08070E30: .4byte gUnknown_8106FAD
+_08070E30: .4byte gDirectionBitMasks
_08070E34:
movs r0, 0
_08070E36:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8070D6C
+ thumb_func_end CannotMoveForward
thumb_func_start sub_8070E3C
sub_8070E3C:
@@ -176,7 +176,7 @@ sub_8070E3C:
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r5, r0, 24
movs r2, 0
@@ -206,7 +206,7 @@ sub_8070E3C:
cmp r0, 0x1
bne _08070F0C
_08070E8A:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08070EDC
@@ -225,7 +225,7 @@ _08070EAC:
movs r5, 0x3
b _08070EDC
.align 2, 0
-_08070EB0: .4byte gUnknown_80F4448
+_08070EB0: .4byte gAdjacentTileOffsets
_08070EB4:
adds r0, r4, 0
movs r1, 0xC
@@ -323,7 +323,7 @@ sub_8070F14:
movs r0, 0x1
b _08070F7A
.align 2, 0
-_08070F70: .4byte gUnknown_80F4448
+_08070F70: .4byte gAdjacentTileOffsets
_08070F74: .4byte gUnknown_8106FBD
_08070F78:
movs r0, 0
@@ -341,7 +341,7 @@ sub_8070F80:
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r5, r0, 24
movs r2, 0x4
@@ -371,7 +371,7 @@ sub_8070F80:
cmp r0, 0x1
bne _08071050
_08070FCC:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08071020
@@ -390,7 +390,7 @@ _08070FEE:
movs r5, 0x3
b _08071020
.align 2, 0
-_08070FF4: .4byte gUnknown_80F4448
+_08070FF4: .4byte gAdjacentTileOffsets
_08070FF8:
adds r0, r4, 0
movs r1, 0xC
@@ -450,7 +450,7 @@ sub_8071058:
ldr r0, [r5, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r6, r0, 24
movs r2, 0x4
@@ -485,7 +485,7 @@ sub_8071058:
cmp r0, 0
bne _08071130
_080710AE:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08071100
@@ -504,7 +504,7 @@ _080710D0:
movs r6, 0x3
b _08071100
.align 2, 0
-_080710D4: .4byte gUnknown_80F4448
+_080710D4: .4byte gAdjacentTileOffsets
_080710D8:
adds r0, r5, 0
movs r1, 0xC
@@ -556,15 +556,15 @@ _08071132:
bx r1
thumb_func_end sub_8071058
- thumb_func_start sub_8071138
-sub_8071138:
+ thumb_func_start CanAttackInFront
+CanAttackInFront:
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
@@ -598,7 +598,7 @@ _08071152:
cmp r0, 0x1
bne _0807120C
_0807118A:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _080711DC
@@ -617,7 +617,7 @@ _080711AC:
movs r5, 0x3
b _080711DC
.align 2, 0
-_080711B0: .4byte gUnknown_80F4448
+_080711B0: .4byte gAdjacentTileOffsets
_080711B4:
adds r0, r4, 0
movs r1, 0xC
@@ -660,17 +660,17 @@ _080711DC:
movs r0, 0x1
b _0807120E
.align 2, 0
-_08071208: .4byte gUnknown_8106FD5
+_08071208: .4byte gDirectionBitMasks_2
_0807120C:
movs r0, 0
_0807120E:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8071138
+ thumb_func_end CanAttackInFront
- thumb_func_start sub_8071214
-sub_8071214:
+ thumb_func_start CanMoveForward
+CanMoveForward:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -680,7 +680,7 @@ sub_8071214:
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
@@ -774,7 +774,7 @@ _080712B8:
cmp r0, 0
bne _0807137E
_080712E6:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _08071348
@@ -793,10 +793,10 @@ _08071308:
movs r6, 0x3
b _08071348
.align 2, 0
-_0807130C: .4byte gUnknown_80F4448
+_0807130C: .4byte gAdjacentTileOffsets
_08071310: .4byte gDungeonGlobalData
_08071314: .4byte 0x00000671
-_08071318: .4byte gUnknown_810ACC0
+_08071318: .4byte gDungeonWaterType
_0807131C: .4byte 0x00003a0e
_08071320:
adds r0, r4, 0
@@ -841,7 +841,7 @@ _08071348:
movs r0, 0x1
b _08071380
.align 2, 0
-_08071374: .4byte gUnknown_8106FDD
+_08071374: .4byte gDirectionBitMasks_3
_08071378:
movs r0, 0x1
mov r3, r8
@@ -854,19 +854,19 @@ _08071380:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8071214
+ thumb_func_end CanMoveForward
- thumb_func_start sub_807138C
-sub_807138C:
+ thumb_func_start IsAtJunction
+IsAtJunction:
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x70]
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_8070328
+ bl GetCrossableTerrain
lsls r0, 24
lsrs r5, r0, 24
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
bne _080713E2
@@ -961,7 +961,7 @@ _08071458:
movs r0, 0
b _0807146A
.align 2, 0
-_0807145C: .4byte gUnknown_810ACC0
+_0807145C: .4byte gDungeonWaterType
_08071460: .4byte gDungeonGlobalData
_08071464: .4byte 0x00003a0e
_08071468:
@@ -970,10 +970,10 @@ _0807146A:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_807138C
+ thumb_func_end IsAtJunction
- thumb_func_start sub_8071470
-sub_8071470:
+ thumb_func_start ShouldAvoidFirstHit
+ShouldAvoidFirstHit:
push {r4,lr}
lsls r1, 24
lsrs r4, r1, 24
@@ -992,6 +992,6 @@ _0807148C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8071470
+ thumb_func_end ShouldAvoidFirstHit
.align 2, 0
diff --git a/asm/code_8071518.s b/asm/code_8071518.s
index 5f6be5b..7c80895 100644
--- a/asm/code_8071518.s
+++ b/asm/code_8071518.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8071518
-sub_8071518:
+ thumb_func_start ShouldAvoidEnemies_2
+ShouldAvoidEnemies_2:
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 24
@@ -20,16 +20,16 @@ sub_8071518:
_0807152E:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8071540
+ bl CheckRunAwayVisualFlag
movs r0, 0x1
_08071538:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8071518
+ thumb_func_end ShouldAvoidEnemies_2
- thumb_func_start sub_8071540
-sub_8071540:
+ thumb_func_start CheckRunAwayVisualFlag
+CheckRunAwayVisualFlag:
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 24
@@ -59,7 +59,7 @@ sub_8071540:
_08071576:
adds r0, r6, 0
movs r1, 0x4
- bl sub_8071ACC
+ bl SetVisualFlags
lsls r0, 24
lsrs r0, 24
cmp r7, 0
@@ -67,15 +67,15 @@ _08071576:
cmp r0, 0
beq _08071590
adds r0, r5, 0
- bl sub_8042910
+ bl ShowVisualFlags
_08071590:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8071540
+ thumb_func_end CheckRunAwayVisualFlag
- thumb_func_start sub_8071598
-sub_8071598:
+ thumb_func_start CanTarget
+CanTarget:
push {r4-r6,lr}
adds r6, r0, 0
lsls r2, 24
@@ -128,7 +128,7 @@ _080715EC:
cmp r0, 0x1
bne _0807160A
adds r0, r6, 0
- bl sub_8071884
+ bl CanSeeInvisible
lsls r0, 24
cmp r0, 0
bne _0807160A
@@ -199,7 +199,7 @@ _08071670:
bx r1
.align 2, 0
_08071678: .4byte gUnknown_8106FE5
- thumb_func_end sub_8071598
+ thumb_func_end CanTarget
thumb_func_start sub_807167C
sub_807167C:
diff --git a/asm/code_8071858.s b/asm/code_8071858.s
index 098dcc8..d0cb318 100644
--- a/asm/code_8071858.s
+++ b/asm/code_8071858.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8071858
-sub_8071858:
+ thumb_func_start HasType
+HasType:
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -32,6 +32,6 @@ _0807187E:
_08071880:
pop {r1}
bx r1
- thumb_func_end sub_8071858
+ thumb_func_end HasType
.align 2, 0
diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
index c1062f4..8fb9e78 100644
--- a/asm/code_80718D8.s
+++ b/asm/code_80718D8.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_807191C
-sub_807191C:
+ thumb_func_start LoadIQSkills
+LoadIQSkills:
push {r4-r6,lr}
ldr r5, [r0, 0x70]
ldrb r1, [r5, 0x6]
@@ -48,7 +48,7 @@ _08071968:
strb r0, [r1]
b _080719BE
.align 2, 0
-_08071974: .4byte gUnknown_80F59C4
+_08071974: .4byte gItemMasterMinWildLevel
_08071978:
adds r0, r5, 0
adds r0, 0x90
@@ -88,10 +88,10 @@ _080719BE:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_807191C
+ thumb_func_end LoadIQSkills
- thumb_func_start sub_80719C4
-sub_80719C4:
+ thumb_func_start CanSeeTeammate
+CanSeeTeammate:
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, [r5, 0x70]
@@ -138,10 +138,10 @@ _08071A0C:
.align 2, 0
_08071A14: .4byte gDungeonGlobalData
_08071A18: .4byte 0x0001357c
- thumb_func_end sub_80719C4
+ thumb_func_end CanSeeTeammate
- thumb_func_start sub_8071A1C
-sub_8071A1C:
+ thumb_func_start GetMoveType_2
+GetMoveType_2:
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -162,7 +162,7 @@ _08071A38:
_08071A3E:
pop {r1}
bx r1
- thumb_func_end sub_8071A1C
+ thumb_func_end GetMoveType_2
thumb_func_start sub_8071A44
sub_8071A44:
@@ -248,8 +248,8 @@ _08071AC4:
bx r1
thumb_func_end sub_8071A8C
- thumb_func_start sub_8071ACC
-sub_8071ACC:
+ thumb_func_start SetVisualFlags
+SetVisualFlags:
push {r4,r5,lr}
adds r3, r0, 0
lsls r1, 16
@@ -318,7 +318,7 @@ _08071B42:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8071ACC
+ thumb_func_end SetVisualFlags
thumb_func_start sub_8071B48
sub_8071B48:
@@ -746,7 +746,7 @@ _08071E68:
ldr r0, _08071EEC
adds r1, r6, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _08071EF0
ldr r2, [r0]
ldr r0, [sp, 0xB4]
@@ -1128,7 +1128,7 @@ sub_807218C:
ldr r0, _080721C8
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r4, 0
bl sub_8070BC0
lsls r0, 24
@@ -1295,7 +1295,7 @@ _080722E2:
movs r2, 0x1
bl PrintFieldMessage
_080722F4:
- bl sub_8083600
+ bl GetLeaderEntity
movs r1, 0
bl sub_806A2BC
add sp, 0x190
@@ -1477,7 +1477,7 @@ _08072456:
ldr r0, _08072478
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _0807247C
ldr r1, [r0]
mov r0, r10
@@ -1499,7 +1499,7 @@ _0807248A:
ldr r0, _0807258C
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _08072590
ldr r1, [r0]
mov r0, r10
@@ -1581,7 +1581,7 @@ _08072524:
str r3, [r6, 0x4]
_0807252E:
mov r0, r10
- bl sub_807191C
+ bl LoadIQSkills
mov r0, r10
bl sub_8079764
ldr r0, [r7]
@@ -1812,7 +1812,7 @@ _080726DE:
str r1, [r6, 0x4]
_080726E8:
ldr r0, [sp, 0x10]
- bl sub_807191C
+ bl LoadIQSkills
ldr r0, [sp, 0x10]
bl sub_8079764
ldr r0, [r7]
@@ -1834,7 +1834,7 @@ _08072710:
ldr r0, _0807273C
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldrb r1, [r5, 0x9]
ldr r0, [sp, 0x20]
cmp r1, r0
@@ -2038,7 +2038,7 @@ _08072894:
ldr r0, _080728C8
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _080728CC
add r1, sp, 0x60
bl strcpy
@@ -2428,7 +2428,7 @@ sub_8072B78:
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r4, 0x50
adds r0, r4, 0
adds r1, r5, 0
@@ -2473,7 +2473,7 @@ sub_8072B78:
.align 2, 0
_08072BFC: .4byte gAvailablePokemonNames
_08072C00: .4byte gUnknown_80FE2EC
-_08072C04: .4byte gUnknown_80F4448
+_08072C04: .4byte gAdjacentTileOffsets
_08072C08:
adds r4, 0x4
adds r5, 0x1
@@ -2536,11 +2536,11 @@ _08072C74:
bx r0
.align 2, 0
_08072C80: .4byte 0x0000013d
-_08072C84: .4byte gUnknown_80F4448
+_08072C84: .4byte gAdjacentTileOffsets
thumb_func_end sub_8072B78
- thumb_func_start sub_8072C88
-sub_8072C88:
+ thumb_func_start TargetLeader
+TargetLeader:
push {lr}
ldr r1, [r0, 0x70]
ldrb r0, [r1, 0x6]
@@ -2549,7 +2549,7 @@ sub_8072C88:
adds r0, r1, 0
adds r0, 0x94
ldrb r0, [r0]
- bl sub_808EAFC
+ bl TacticsTargetLeader
lsls r0, 24
lsrs r0, 24
b _08072CA4
@@ -2558,17 +2558,17 @@ _08072CA2:
_08072CA4:
pop {r1}
bx r1
- thumb_func_end sub_8072C88
+ thumb_func_end TargetLeader
- thumb_func_start sub_8072CA8
-sub_8072CA8:
+ thumb_func_start GetLeaderEntityIfVisible
+GetLeaderEntityIfVisible:
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0x70]
ldrb r0, [r0, 0x6]
cmp r0, 0
bne _08072CEC
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
cmp r4, 0
beq _08072CEC
@@ -2581,13 +2581,13 @@ sub_8072CA8:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _08072CEC
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8045A00
+ bl CanSee_2
lsls r0, 24
cmp r0, 0
beq _08072CEC
@@ -2599,7 +2599,7 @@ _08072CEE:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8072CA8
+ thumb_func_end GetLeaderEntityIfVisible
thumb_func_start sub_8072CF4
sub_8072CF4:
@@ -2657,7 +2657,7 @@ _08072D58:
_08072D64:
adds r0, r4, 0
movs r1, 0
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _08072D86
@@ -2693,12 +2693,12 @@ _08072DA4:
bge _08072D92
adds r0, r4, 0
movs r1, 0
- bl sub_8045028
+ bl IsNotAttacking
lsls r0, 24
cmp r0, 0
bne _08072E08
adds r0, r4, 0
- bl sub_807520C
+ bl UseAttack
lsls r0, 24
cmp r0, 0
beq _08072DF0
@@ -2895,7 +2895,7 @@ _08072F84:
bne _08072FCC
adds r0, r4, 0
adds r1, r3, 0
- bl sub_8070D6C
+ bl CannotMoveForward
lsls r0, 24
cmp r0, 0
bne _08072FCC
@@ -2914,7 +2914,7 @@ _08072FDA:
strb r0, [r1]
b _080731B8
.align 2, 0
-_08072FE0: .4byte gUnknown_80F4448
+_08072FE0: .4byte gAdjacentTileOffsets
_08072FE4: .4byte 0x00000147
_08072FE8:
ldrh r1, [r4, 0x6]
@@ -3327,12 +3327,12 @@ _08073332:
mov r9, r2
mov r0, r8
movs r1, 0x1
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
bne _0807336E
mov r0, r8
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
bne _08073364
@@ -3416,7 +3416,7 @@ _080733DE:
mov r0, r8
adds r1, r5, 0
movs r2, 0x1
- bl sub_80573CC
+ bl IsMoveUsable_2
lsls r0, 24
cmp r0, 0
bne _08073440
@@ -3537,7 +3537,7 @@ _080734CC:
mov r8, r1
adds r0, r7, 0
movs r1, 0x1
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _080734F4
@@ -3552,7 +3552,7 @@ _080734EC: .4byte 0x000135cc
_080734F0: .4byte 0x00000165
_080734F4:
adds r0, r7, 0
- bl sub_8070B28
+ bl IsSleeping
lsls r0, 24
cmp r0, 0
bne _08073514
@@ -3627,7 +3627,7 @@ _0807357A:
adds r1, r5, 0
movs r2, 0x1
str r3, [sp, 0x14]
- bl sub_80573CC
+ bl IsMoveUsable_2
lsls r0, 24
ldr r3, [sp, 0x14]
cmp r0, 0
diff --git a/asm/code_80739DC.s b/asm/code_80739DC.s
index 86a68d1..18efc16 100644
--- a/asm/code_80739DC.s
+++ b/asm/code_80739DC.s
@@ -53,7 +53,7 @@ _08073A0A:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _08073A88
@@ -61,7 +61,7 @@ _08073A0A:
b _08073A6A
.align 2, 0
_08073A44: .4byte gNumPotentialTargets
-_08073A48: .4byte gUnknown_202F350
+_08073A48: .4byte gTargetAhead
_08073A4C: .4byte gDungeonGlobalData
_08073A50: .4byte 0x000135cc
_08073A54:
@@ -69,7 +69,7 @@ _08073A54:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -88,7 +88,7 @@ _08073A6A:
adds r1, r4, 0
mov r2, r9
adds r3, r6, 0
- bl sub_8073B78
+ bl TargetThrownItem
_08073A88:
adds r7, 0x1
cmp r7, 0x13
@@ -146,7 +146,7 @@ _08073AC0:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -213,8 +213,8 @@ _08073B70: .4byte gDungeonGlobalData
_08073B74: .4byte 0x000135cc
thumb_func_end FindRockItemTargets
- thumb_func_start sub_8073B78
-sub_8073B78:
+ thumb_func_start TargetThrownItem
+TargetThrownItem:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -367,7 +367,7 @@ _08073C7E:
adds r1, r5, 0
adds r2, r6, 0
movs r3, 0xA
- bl sub_807C9F8
+ bl IsTargetStraightAhead
lsls r0, 24
cmp r0, 0
beq _08073CDC
@@ -390,7 +390,7 @@ _08073C7E:
bl EvaluateItem
b _08073CD2
.align 2, 0
-_08073CC0: .4byte gUnknown_202F350
+_08073CC0: .4byte gTargetAhead
_08073CC4: .4byte gPotentialTargetDirections
_08073CC8: .4byte gNumPotentialTargets
_08073CCC: .4byte gPotentialTargetWeights
@@ -412,7 +412,7 @@ _08073CDC:
bx r0
.align 2, 0
_08073CEC: .4byte gNumPotentialTargets
- thumb_func_end sub_8073B78
+ thumb_func_end TargetThrownItem
thumb_func_start sub_8073CF0
sub_8073CF0:
@@ -514,7 +514,7 @@ _08073D80:
_08073D98:
adds r0, r6, 0
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _08073DC8
@@ -950,7 +950,7 @@ _08074102:
adds r0, r5, 0
bl sub_80444F4
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1094,11 +1094,11 @@ _0807421E:
str r0, [r4]
movs r6, 0x1
adds r0, r7, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x13
ble _0807425C
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x13
bgt _0807425C
ldr r0, _08074368
@@ -1106,14 +1106,14 @@ _0807421E:
mov r9, r0
_0807425C:
adds r0, r7, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x9
ble _0807427C
movs r0, 0x9E
lsls r0, 1
add r0, r8
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0x9
bgt _0807427C
ldr r0, _0807436C
@@ -1124,7 +1124,7 @@ _0807427C:
lsls r4, 1
add r4, r8
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bne _08074298
add r0, sp, 0x20
@@ -1134,7 +1134,7 @@ _0807427C:
str r0, [r4]
_08074298:
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bge _080742AE
add r0, sp, 0x24
@@ -1144,14 +1144,14 @@ _08074298:
str r0, [r4]
_080742AE:
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
bne _08074384
bl sub_805E804
adds r0, r5, 0
bl sub_80444F4
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1212,7 +1212,7 @@ _08074320:
movs r0, 0x1
strb r0, [r1]
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r0, 0
beq _08074390
b _080743B0
@@ -1275,14 +1275,14 @@ _080743CA:
cmp r0, 0
bne _08074480
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
bne _0807441C
adds r0, r5, 0
movs r1, 0x6
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _08074466
@@ -1303,26 +1303,26 @@ _08074414: .4byte 0x0000e266
_08074418: .4byte gUnknown_80F4F8E
_0807441C:
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _08074466
adds r0, r5, 0
movs r1, 0x9
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _08074466
adds r0, r5, 0
movs r1, 0xD
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _08074466
adds r0, r5, 0
movs r1, 0x11
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _08074466
@@ -1363,12 +1363,12 @@ _08074480:
cmp r4, r0
bge _080744D8
adds r0, r5, 0
- bl sub_8070A58
+ bl HasNegativeStatus
lsls r0, 24
cmp r0, 0
beq _080744D8
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1419,7 +1419,7 @@ _0807450C:
cmp r0, 0x4
bne _0807453C
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1454,7 +1454,7 @@ _0807453C:
bne _0807459C
_0807455C:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1511,7 +1511,7 @@ _080745B6:
bne _08074696
_080745D0:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1574,7 +1574,7 @@ _0807464E:
movs r4, 0x1D
_0807465A:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1633,7 +1633,7 @@ _080746B0:
bne _08074786
_080746D0:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1687,7 +1687,7 @@ _08074730:
bne _08074786
_08074748:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1749,7 +1749,7 @@ _080747B0:
bne _08074802
_080747C8:
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1808,7 +1808,7 @@ _08074834:
ldrh r0, [r0]
strb r0, [r2]
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1913,7 +1913,7 @@ _08074906:
adds r0, r5, 0
bl sub_80444F4
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -1993,7 +1993,7 @@ _080749AE:
cmp r0, 0
bne _08074A46
movs r0, 0
- bl sub_807520C
+ bl UseAttack
adds r0, r5, 0
bl EntityExists
lsls r0, 24
@@ -2071,7 +2071,7 @@ _08074A46:
bne _08074AD4
adds r0, r5, 0
movs r1, 0
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
bne _08074AD4
@@ -2082,7 +2082,7 @@ _08074A46:
cmp r6, 0
bne _08074AD4
movs r0, 0
- bl sub_807520C
+ bl UseAttack
add r4, sp, 0x28
ldr r1, _08074B48
adds r0, r4, 0
@@ -2168,8 +2168,8 @@ _08074B4C: .4byte gAvailablePokemonNames
_08074B50: .4byte gUnknown_80FABD8
thumb_func_end sub_8074094
- thumb_func_start sub_8074B54
-sub_8074B54:
+ thumb_func_start TickStatusHeal
+TickStatusHeal:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2245,7 +2245,7 @@ _08074BDA:
cmp r0, 0
beq _08074BFE
adds r0, r7, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -2686,7 +2686,7 @@ _08074F5C:
adds r0, r2
ldr r4, [r0]
adds r0, r7, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r5, r0, 0
cmp r4, r5
beq _08074F96
@@ -2711,7 +2711,7 @@ _08074FA0: .4byte gPtrStenchWavedOffMessage
_08074FA4: .4byte 0x0000010d
_08074FA8: .4byte gAvailablePokemonNames
_08074FAC: .4byte gUnknown_80FA124
- thumb_func_end sub_8074B54
+ thumb_func_end TickStatusHeal
thumb_func_start sub_8074FB0
sub_8074FB0:
@@ -3019,8 +3019,8 @@ _080751F8:
_08075208: .4byte gUnknown_202F378
thumb_func_end sub_8075050
- thumb_func_start sub_807520C
-sub_807520C:
+ thumb_func_start UseAttack
+UseAttack:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3566,7 +3566,7 @@ _0807566C:
bx r1
.align 2, 0
_0807567C: .4byte gDungeonGlobalData
- thumb_func_end sub_807520C
+ thumb_func_end UseAttack
thumb_func_start sub_8075680
sub_8075680:
@@ -3922,7 +3922,7 @@ sub_8075900:
ands r0, r1
cmp r0, 0
beq _0807597A
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _08075988
ldr r1, [r1]
bl SendMessage
diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s
index f925cc2..3981d7a 100644
--- a/asm/code_8075BA4.s
+++ b/asm/code_8075BA4.s
@@ -26,7 +26,7 @@ sub_8075BA4:
ands r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl sub_8069DCC
+ bl TargetTileInFront
b _08075BEC
_08075BD0:
adds r0, r4, 0
@@ -40,7 +40,7 @@ _08075BD0:
adds r1, 0x46
strb r0, [r1]
adds r0, r5, 0
- bl sub_8069DCC
+ bl TargetTileInFront
_08075BEC:
pop {r4,r5}
pop {r0}
@@ -683,7 +683,7 @@ _080760D0:
ldr r0, _08076100
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r1, r5, 0
adds r1, 0xBC
ldrb r0, [r1]
@@ -786,7 +786,7 @@ _080761A8:
ldr r0, _080761E8
adds r1, r5, 0
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r1, r5, 0
adds r1, 0xBC
ldrb r0, [r1]
@@ -867,7 +867,7 @@ _0807624A:
ldr r0, _08076274
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r5, 0
movs r1, 0x42
bl HasAbility
@@ -887,7 +887,7 @@ _08076278: .4byte gUnknown_80FCE5C
_0807627C:
adds r0, r5, 0
movs r1, 0x2
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0807629C
@@ -932,7 +932,7 @@ _080762CC:
bl sub_80522F4
b _080763DA
.align 2, 0
-_080762D8: .4byte gUnknown_810ACC0
+_080762D8: .4byte gDungeonWaterType
_080762DC: .4byte gDungeonGlobalData
_080762E0: .4byte 0x00003a0e
_080762E4: .4byte gUnknown_80FEBBC
@@ -1027,7 +1027,7 @@ _08076362:
ldr r0, _080763F0
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _080763F4
ldr r2, [r0]
adds r0, r7, 0
@@ -1060,7 +1060,7 @@ _080763DA:
bx r0
.align 2, 0
_080763E8: .4byte gUnknown_80FB564
-_080763EC: .4byte gUnknown_80F4448
+_080763EC: .4byte gAdjacentTileOffsets
_080763F0: .4byte gAvailablePokemonNames
_080763F4: .4byte gUnknown_80FF01C
thumb_func_end sub_8076210
@@ -1098,7 +1098,7 @@ _0807642C:
ldr r0, _08076454
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r5, 0
movs r1, 0x14
bl HasItem
@@ -1134,13 +1134,13 @@ _08076478: .4byte gUnknown_80FCEB0
_0807647C:
adds r0, r5, 0
movs r1, 0x8
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _0807649A
adds r0, r5, 0
movs r1, 0x11
- bl sub_8071858
+ bl HasType
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1259,7 +1259,7 @@ _08076544:
ldr r0, _080765D8
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _080765DC
ldr r2, [r0]
adds r0, r7, 0
@@ -1294,7 +1294,7 @@ _080765C0:
bx r0
.align 2, 0
_080765D0: .4byte gUnknown_80FB5F8
-_080765D4: .4byte gUnknown_80F4448
+_080765D4: .4byte gAdjacentTileOffsets
_080765D8: .4byte gAvailablePokemonNames
_080765DC: .4byte gUnknown_80FF01C
thumb_func_end sub_80763F8
@@ -1332,7 +1332,7 @@ _08076614:
ldr r0, _0807663C
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
adds r0, r5, 0
movs r1, 0x14
bl HasItem
@@ -1368,13 +1368,13 @@ _08076660: .4byte gUnknown_80FCEB0
_08076664:
adds r0, r5, 0
movs r1, 0x8
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _08076682
adds r0, r5, 0
movs r1, 0x11
- bl sub_8071858
+ bl HasType
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1482,7 +1482,7 @@ _08076714:
ldr r0, _080767A8
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _080767AC
ldr r2, [r0]
adds r0, r7, 0
@@ -1517,7 +1517,7 @@ _08076790:
bx r0
.align 2, 0
_080767A0: .4byte gUnknown_80FB5F8
-_080767A4: .4byte gUnknown_80F4448
+_080767A4: .4byte gAdjacentTileOffsets
_080767A8: .4byte gAvailablePokemonNames
_080767AC: .4byte gUnknown_80FF01C
thumb_func_end sub_80765E0
@@ -1572,7 +1572,7 @@ _08076810: .4byte gUnknown_80FCDE0
_08076814:
adds r0, r5, 0
movs r1, 0x6
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _08076830
@@ -1611,7 +1611,7 @@ _0807685C:
bl sub_80522F4
b _080768C8
.align 2, 0
-_08076868: .4byte gUnknown_810ACC0
+_08076868: .4byte gDungeonWaterType
_0807686C: .4byte gDungeonGlobalData
_08076870: .4byte 0x00003a0e
_08076874: .4byte gUnknown_80FCE34
@@ -2803,8 +2803,8 @@ _0807722E:
_08077238: .4byte gUnknown_80FC21C
thumb_func_end sub_8077160
- thumb_func_start sub_807723C
-sub_807723C:
+ thumb_func_start GetFlashFireStatus
+GetFlashFireStatus:
push {r4,lr}
adds r4, r0, 0
bl EntityExists
@@ -2834,7 +2834,7 @@ _0807726C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_807723C
+ thumb_func_end GetFlashFireStatus
thumb_func_start sub_8077274
sub_8077274:
@@ -3549,7 +3549,7 @@ _080777EC:
adds r0, r5, 0
bl sub_8041C1C
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
b _0807785C
.align 2, 0
_08077844: .4byte gAvailablePokemonNames
@@ -3606,7 +3606,7 @@ _08077874:
ldr r0, _08077908
mov r1, r8
movs r2, 0
- bl sub_80708B4
+ bl SetMessageArgument_2
ldr r0, _0807790C
ldr r2, [r0]
adds r0, r7, 0
@@ -3641,7 +3641,7 @@ _080778F0:
bx r0
.align 2, 0
_08077900: .4byte gUnknown_80FB2CC
-_08077904: .4byte gUnknown_80F4448
+_08077904: .4byte gAdjacentTileOffsets
_08077908: .4byte gAvailablePokemonNames
_0807790C: .4byte gUnknown_80FF01C
thumb_func_end sub_8077780
@@ -3677,7 +3677,7 @@ _08077940:
movs r2, 0
bl SetMessageArgument
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r7, r0, 0
cmp r7, 0x4
bne _08077970
@@ -3711,7 +3711,7 @@ _08077988:
strb r4, [r1]
_08077990:
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r4, r0, 0
cmp r7, r4
bne _080779B0
@@ -3789,7 +3789,7 @@ sub_80779F0:
movs r2, 0
bl SetMessageArgument
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
str r0, [sp]
cmp r0, 0
bne _08077A50
@@ -3835,7 +3835,7 @@ _08077A86:
blt _08077A56
_08077A8C:
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r4, r0, 0
ldr r0, [sp]
cmp r0, r4
@@ -4473,7 +4473,7 @@ _08077F88:
bl SetMessageArgument
adds r0, r4, 0
movs r1, 0x4
- bl sub_8071858
+ bl HasType
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -5220,7 +5220,7 @@ sub_8078594:
ldr r7, [r6, 0x70]
adds r0, r5, 0
movs r1, 0xE
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _08078640
@@ -5828,10 +5828,10 @@ sub_8078A58:
movs r2, 0
bl SetMessageArgument
adds r0, r7, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r4, r0
beq _08078AD8
adds r0, r6, 0
@@ -5865,10 +5865,10 @@ _08078AE0:
movs r2, 0
bl SetMessageArgument
adds r0, r7, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r5, r0, 0
ldr r0, [r4]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r5, r0
beq _08078B38
adds r0, r6, 0
@@ -5958,13 +5958,13 @@ _08078BB8:
lsls r1, 1
adds r0, r7, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
movs r1, 0xA0
lsls r1, 1
adds r0, r7, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r4, r0
blt _08078BE0
movs r5, 0x1
@@ -5985,10 +5985,10 @@ _08078BE8:
adds r0, r7
mov r10, r0
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
movs r1, 0
str r1, [sp, 0x24]
cmp r4, r0
@@ -6029,13 +6029,13 @@ _08078C16:
bl sub_80522F4
_08078C5E:
ldr r0, [sp, 0x20]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
movs r1, 0xA0
lsls r1, 1
adds r0, r7, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r4, r0
bne _08078C9C
ldr r0, _08078C94
@@ -6102,10 +6102,10 @@ _08078CFA:
movs r2, 0
bl SetMessageArgument
adds r0, r4, 0
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r4, r0
bne _08078D34
mov r1, r8
@@ -6119,10 +6119,10 @@ _08078D2C: .4byte gAvailablePokemonNames
_08078D30: .4byte gUnknown_80FBE14
_08078D34:
ldr r0, [r5]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r4, r0, 0
ldr r0, [r7]
- bl sub_8094450
+ bl GetBellyRoundedUp
cmp r4, r0
blt _08078D60
mov r0, r8
@@ -6274,7 +6274,7 @@ _08078E6E:
bl DungeonRandomCapped
lsls r0, 3
add r0, sp
- bl sub_808E9B8
+ bl ExtractSpeciesIndex
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -6519,7 +6519,7 @@ _08079070:
_0807907E:
adds r0, r4, 0
movs r1, 0xE
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _080790A0
@@ -8375,7 +8375,7 @@ sub_8079F20:
_08079F50:
ldr r7, [r4, 0x70]
adds r0, r4, 0
- bl sub_8070A58
+ bl HasNegativeStatus
lsls r0, 24
cmp r0, 0
beq _08079FF2
@@ -8445,7 +8445,7 @@ _08079FD8:
bl sub_80522F4
_08079FF2:
adds r0, r4, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r6, r0, 0
movs r1, 0
movs r3, 0x4
@@ -8458,7 +8458,7 @@ _0807A002:
cmp r3, 0
bge _0807A002
adds r0, r4, 0
- bl sub_8070774
+ bl GetMovementSpeed
cmp r6, r0
beq _0807A032
movs r0, 0x1
@@ -9035,7 +9035,7 @@ _0807A4A8:
adds r0, r5, 0
bl sub_80418D4
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
_0807A4BC:
pop {r4-r6}
pop {r0}
@@ -9940,7 +9940,7 @@ _0807ABC6:
adds r0, r4, 0
adds r1, r6, 0
str r2, [sp, 0x1A4]
- bl sub_8049590
+ bl GetMapEntity
adds r1, r0, 0
ldr r0, [r1, 0x10]
ldr r2, [sp, 0x1A4]
@@ -10030,7 +10030,7 @@ _0807AC72:
adds r0, r4, 0
adds r1, r6, 0
str r2, [sp, 0x1A4]
- bl sub_8049590
+ bl GetMapEntity
adds r1, r0, 0
ldr r0, [r1, 0x10]
ldr r2, [sp, 0x1A4]
@@ -10249,7 +10249,7 @@ _0807AE12:
lsls r1, 1
adds r0, r4, r1
ldr r0, [r0]
- bl sub_8094450
+ bl GetBellyRoundedUp
adds r1, r0, 0
cmp r1, 0
bne _0807AE32
@@ -10287,16 +10287,16 @@ _0807AE32:
_0807AE6A:
adds r0, r5, 0
adds r1, r7, 0
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _0807AE80
adds r0, r5, 0
- bl sub_807B5E0
+ bl AvoidEnemies
b _0807AE9C
_0807AE80:
adds r0, r5, 0
- bl sub_807AEBC
+ bl CanTakeItem
lsls r0, 24
cmp r0, 0
beq _0807AE96
@@ -10307,7 +10307,7 @@ _0807AE80:
b _0807AEB4
_0807AE96:
adds r0, r5, 0
- bl sub_807AF58
+ bl ChooseTargetPosition
_0807AE9C:
lsls r0, 24
lsrs r2, r0, 24
@@ -10320,15 +10320,15 @@ _0807AE9C:
_0807AEAC:
adds r0, r5, 0
adds r1, r7, 0
- bl sub_807B2D8
+ bl DecideMovement
_0807AEB4:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end MoveIfPossible
- thumb_func_start sub_807AEBC
-sub_807AEBC:
+ thumb_func_start CanTakeItem
+CanTakeItem:
push {r4-r6,lr}
adds r4, r0, 0
ldr r5, [r4, 0x70]
@@ -10401,10 +10401,10 @@ _0807AF52:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_807AEBC
+ thumb_func_end CanTakeItem
- thumb_func_start sub_807AF58
-sub_807AF58:
+ thumb_func_start ChooseTargetPosition
+ChooseTargetPosition:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -10413,7 +10413,7 @@ sub_807AF58:
sub sp, 0xC
mov r8, r0
ldr r7, [r0, 0x70]
- bl sub_8072C88
+ bl TargetLeader
lsls r0, 24
cmp r0, 0
beq _0807AF74
@@ -10453,7 +10453,7 @@ _0807AFAC:
mov r10, r3
_0807AFB4:
mov r0, r8
- bl sub_8070460
+ bl CanCrossWalls
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -10495,7 +10495,7 @@ _0807AFD6:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -10550,7 +10550,7 @@ _0807B070:
_0807B074:
mov r0, r8
adds r1, r4, 0
- bl sub_8045A00
+ bl CanSee_2
lsls r0, 24
cmp r0, 0
beq _0807B098
@@ -10558,7 +10558,7 @@ _0807B082:
adds r1, r4, 0x4
mov r0, r8
adds r0, 0x4
- bl sub_8098434
+ bl GetMaxPositionDifference
cmp r9, r0
ble _0807B098
mov r9, r0
@@ -10606,7 +10606,7 @@ _0807B09E:
b _0807B2C6
_0807B0E4:
mov r0, r8
- bl sub_80719C4
+ bl CanSeeTeammate
lsls r0, 24
cmp r0, 0
beq _0807B0F2
@@ -10659,7 +10659,7 @@ _0807B12C:
cmp r5, 0
bne _0807B222
mov r0, r8
- bl sub_8072CA8
+ bl GetLeaderEntityIfVisible
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -10754,7 +10754,7 @@ _0807B1FA:
_0807B200:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
ldr r0, [r0, 0x14]
cmp r0, 0
beq _0807B216
@@ -10797,7 +10797,7 @@ _0807B250:
lsls r6, r5, 2
mov r0, r8
adds r1, r4, 0
- bl sub_8045ABC
+ bl InSameRoom
lsls r0, 24
cmp r0, 0
bne _0807B294
@@ -10853,7 +10853,7 @@ _0807B2B4:
strh r1, [r2]
_0807B2C0:
mov r0, r8
- bl sub_807B920
+ bl Explore
_0807B2C6:
movs r0, 0x1
add sp, 0xC
@@ -10864,10 +10864,10 @@ _0807B2C6:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807AF58
+ thumb_func_end ChooseTargetPosition
- thumb_func_start sub_807B2D8
-sub_807B2D8:
+ thumb_func_start DecideMovement
+DecideMovement:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -10900,7 +10900,7 @@ sub_807B2D8:
adds r0, 0x7A
ldrb r1, [r0]
mov r0, r9
- bl sub_8071470
+ bl ShouldAvoidFirstHit
lsls r0, 24
cmp r0, 0
beq _0807B366
@@ -10911,13 +10911,13 @@ sub_807B2D8:
bne _0807B37C
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8083478
+ bl IsTargetTwoTilesAway
lsls r0, 24
cmp r0, 0
beq _0807B37C
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8098434
+ bl GetMaxPositionDifference
cmp r0, 0x2
bne _0807B354
_0807B348:
@@ -10953,7 +10953,7 @@ _0807B37C:
mov r0, r9
mov r1, r8
adds r2, r4, 0
- bl sub_8071214
+ bl CanMoveForward
lsls r0, 24
cmp r0, 0
beq _0807B3A8
@@ -11039,7 +11039,7 @@ _0807B3E8:
strb r0, [r1]
b _0807B5CE
.align 2, 0
-_0807B434: .4byte gUnknown_80F4448
+_0807B434: .4byte gAdjacentTileOffsets
_0807B438: .4byte 0x00000147
_0807B43C:
adds r1, r5, 0
@@ -11123,7 +11123,7 @@ _0807B4C8:
mov r10, r1
mov r0, r9
adds r1, r7, 0
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
bne _0807B4E4
@@ -11161,7 +11161,7 @@ _0807B4FC:
mov r0, r9
adds r2, r4, 0
str r3, [sp, 0x38]
- bl sub_8071214
+ bl CanMoveForward
strb r0, [r7, 0x1]
lsls r0, 24
ldr r3, [sp, 0x38]
@@ -11229,7 +11229,7 @@ _0807B56E:
strb r1, [r0]
b _0807B5CE
.align 2, 0
-_0807B598: .4byte gUnknown_80F4D04
+_0807B598: .4byte gFaceDirectionIncrements
_0807B59C: .4byte 0x00000147
_0807B5A0:
movs r3, 0x2
@@ -11264,10 +11264,10 @@ _0807B5CE:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_807B2D8
+ thumb_func_end DecideMovement
- thumb_func_start sub_807B5E0
-sub_807B5E0:
+ thumb_func_start AvoidEnemies
+AvoidEnemies:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -11351,7 +11351,7 @@ _0807B65C:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -11359,7 +11359,7 @@ _0807B65C:
_0807B69A:
adds r1, r4, 0x4
adds r0, r7, 0x4
- bl sub_8098434
+ bl GetMaxPositionDifference
ldr r3, [sp, 0x8]
cmp r3, r0
ble _0807B6CE
@@ -11449,7 +11449,7 @@ _0807B71E:
adds r0, r7, 0
adds r1, r4, 0
mov r2, sp
- bl sub_8071214
+ bl CanMoveForward
lsls r0, 24
cmp r0, 0
bne _0807B75E
@@ -11487,7 +11487,7 @@ _0807B790: .4byte 0x0001358c
_0807B794: .4byte gDungeonGlobalData
_0807B798: .4byte 0x000037fc
_0807B79C: .4byte 0x000f423f
-_0807B7A0: .4byte gUnknown_80F4448
+_0807B7A0: .4byte gAdjacentTileOffsets
_0807B7A4:
movs r0, 0x5
ldr r3, [sp, 0x24]
@@ -11682,7 +11682,7 @@ _0807B8E0:
b _0807B910
_0807B906:
adds r0, r7, 0
- bl sub_807B920
+ bl Explore
lsls r0, 24
lsrs r0, 24
_0807B910:
@@ -11694,10 +11694,10 @@ _0807B910:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807B5E0
+ thumb_func_end AvoidEnemies
- thumb_func_start sub_807B920
-sub_807B920:
+ thumb_func_start Explore
+Explore:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -11723,7 +11723,7 @@ sub_807B920:
ands r1, r0
mov r8, r1
adds r0, r6, 0
- bl sub_807138C
+ bl IsAtJunction
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11760,7 +11760,7 @@ _0807B994:
adds r1, r4, 0
mov r2, sp
str r3, [sp, 0xC]
- bl sub_8071214
+ bl CanMoveForward
lsls r0, 24
ldr r3, [sp, 0xC]
cmp r0, 0
@@ -11787,8 +11787,8 @@ _0807B9AA:
ldrh r0, [r0, 0x2]
b _0807BB5A
.align 2, 0
-_0807B9D4: .4byte gUnknown_80F4D04
-_0807B9D8: .4byte gUnknown_80F4448
+_0807B9D4: .4byte gFaceDirectionIncrements
+_0807B9D8: .4byte gAdjacentTileOffsets
_0807B9DC:
ldr r0, _0807BA30
ldr r2, [r0]
@@ -11835,7 +11835,7 @@ _0807B9DC:
_0807BA30: .4byte gDungeonGlobalData
_0807BA34: .4byte 0x00010844
_0807BA38: .4byte 0x00010884
-_0807BA3C: .4byte gUnknown_80F4448
+_0807BA3C: .4byte gAdjacentTileOffsets
_0807BA40:
adds r0, r7, 0
adds r0, 0x78
@@ -11868,7 +11868,7 @@ _0807BA40:
strh r0, [r1]
b _0807BB60
.align 2, 0
-_0807BA80: .4byte gUnknown_80F4448
+_0807BA80: .4byte gAdjacentTileOffsets
_0807BA84:
movs r5, 0
_0807BA86:
@@ -11928,7 +11928,7 @@ _0807BAC4:
adds r1, r4, 0
mov r2, sp
adds r2, 0x1
- bl sub_8071214
+ bl CanMoveForward
lsls r0, 24
cmp r0, 0
bne _0807BB2E
@@ -11941,7 +11941,7 @@ _0807BB04:
ble _0807BAC4
b _0807BB60
.align 2, 0
-_0807BB14: .4byte gUnknown_80F4448
+_0807BB14: .4byte gAdjacentTileOffsets
_0807BB18:
movs r0, 0x4
mov r3, r10
@@ -11993,8 +11993,8 @@ _0807BB60:
pop {r1}
bx r1
.align 2, 0
-_0807BB74: .4byte gUnknown_80F4448
- thumb_func_end sub_807B920
+_0807BB74: .4byte gAdjacentTileOffsets
+ thumb_func_end Explore
thumb_func_start sub_807BB78
sub_807BB78:
@@ -12027,7 +12027,7 @@ DecideAttack:
mov r8, r0
mov r0, r10
movs r1, 0
- bl sub_8070D04
+ bl CannotAttack
lsls r0, 24
cmp r0, 0
beq _0807BBB6
@@ -12035,7 +12035,7 @@ DecideAttack:
_0807BBB6:
mov r0, r10
movs r1, 0x1
- bl sub_8071518
+ bl ShouldAvoidEnemies_2
lsls r0, 24
cmp r0, 0
beq _0807BBC6
@@ -12129,7 +12129,7 @@ _0807BC62:
bne _0807BC58
b _0807C006
.align 2, 0
-_0807BC70: .4byte gUnknown_80F4DB2
+_0807BC70: .4byte gConfusedAttackChance
_0807BC74:
adds r4, 0x8
adds r5, 0x1
@@ -12180,7 +12180,7 @@ _0807BCB0:
mov r0, sp
mov r1, r10
adds r2, r4, 0
- bl sub_807C04C
+ bl FindMoveTarget
mov r0, sp
ldrb r0, [r0]
cmp r0, 0
@@ -12337,7 +12337,7 @@ _0807BDD6:
mov r0, r10
adds r1, r5, 0
ldr r2, [sp, 0x3C]
- bl sub_8057348
+ bl IsMoveUsable
lsls r0, 24
cmp r0, 0
beq _0807BE64
@@ -12362,7 +12362,7 @@ _0807BDD6:
_0807BE24:
mov r0, r10
adds r1, r6, 0
- bl sub_8071A1C
+ bl GetMoveType_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -12376,7 +12376,7 @@ _0807BE38:
ldr r0, [sp, 0x58]
mov r1, r10
adds r2, r6, 0
- bl sub_807C04C
+ bl FindMoveTarget
b _0807BE54
_0807BE4A:
adds r0, r6, 0
@@ -12521,7 +12521,7 @@ _0807BF32:
add r1, sp, 0x34
mov r0, r10
movs r2, 0x1
- bl sub_807C854
+ bl TargetRegularAttack
lsls r0, 24
lsrs r6, r0, 24
b _0807BF5E
@@ -12568,7 +12568,7 @@ _0807BF9C:
add r2, r8
adds r0, r4, 0
mov r1, r10
- bl sub_807C04C
+ bl FindMoveTarget
ldrb r0, [r4]
cmp r0, 0
beq _0807C01A
@@ -12618,7 +12618,7 @@ _0807C006:
strb r3, [r6]
_0807C008:
mov r0, r10
- bl sub_8069DCC
+ bl TargetTileInFront
b _0807C03A
_0807C010:
adds r4, 0x8
@@ -12640,7 +12640,7 @@ _0807C01A:
adds r1, 0x46
strb r0, [r1]
mov r0, r10
- bl sub_8069DCC
+ bl TargetTileInFront
_0807C03A:
add sp, 0x5C
pop {r3-r5}
@@ -12652,8 +12652,8 @@ _0807C03A:
bx r0
thumb_func_end DecideAttack
- thumb_func_start sub_807C04C
-sub_807C04C:
+ thumb_func_start FindMoveTarget
+FindMoveTarget:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -12679,7 +12679,7 @@ _0807C06E:
adds r0, r6, 0
mov r1, r10
movs r2, 0x1
- bl sub_807CD64
+ bl GetTargetingFlags
lsls r0, 16
asrs r0, 16
str r0, [sp, 0xC]
@@ -12708,7 +12708,7 @@ _0807C0B0:
beq _0807C0CC
adds r0, r6, 0
mov r1, r10
- bl sub_805C498
+ bl CanUseWithStatusChecker
lsls r0, 24
cmp r0, 0
bne _0807C0CC
@@ -12716,7 +12716,7 @@ _0807C0C4:
movs r0, 0x1
b _0807C48C
.align 2, 0
-_0807C0C8: .4byte gUnknown_202F380
+_0807C0C8: .4byte gCanAttackInDirection
_0807C0CC:
movs r0, 0xF0
ldr r1, [sp, 0xC]
@@ -12759,9 +12759,9 @@ _0807C0F8:
add r8, r0
b _0807C3F6
.align 2, 0
-_0807C118: .4byte gUnknown_202F380
+_0807C118: .4byte gCanAttackInDirection
_0807C11C: .4byte gUnknown_202F388
-_0807C120: .4byte gUnknown_202F390
+_0807C120: .4byte gPotentialTargetWeights_2
_0807C124: .4byte gUnknown_202F3B0
_0807C128:
movs r7, 0
@@ -12798,7 +12798,7 @@ _0807C132:
beq _0807C178
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8071138
+ bl CanAttackInFront
lsls r0, 24
cmp r0, 0
beq _0807C18E
@@ -12811,7 +12811,7 @@ _0807C178:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r4, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
_0807C18E:
adds r7, 0x1
@@ -12819,7 +12819,7 @@ _0807C18E:
ble _0807C132
b _0807C3F6
.align 2, 0
-_0807C198: .4byte gUnknown_80F4448
+_0807C198: .4byte gAdjacentTileOffsets
_0807C19C:
cmp r0, 0x30
bne _0807C1F0
@@ -12851,7 +12851,7 @@ _0807C1A2:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r4, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
_0807C1E0:
adds r5, 0x1
@@ -12883,7 +12883,7 @@ _0807C1FA:
adds r4, r0, 0
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8071138
+ bl CanAttackInFront
lsls r0, 24
cmp r0, 0
beq _0807C296
@@ -12903,7 +12903,7 @@ _0807C1FA:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r5, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
cmp r4, r8
bne _0807C296
@@ -12938,7 +12938,7 @@ _0807C250:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r5, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
_0807C296:
movs r2, 0x4
@@ -12948,7 +12948,7 @@ _0807C296:
ble _0807C1FA
b _0807C3F6
.align 2, 0
-_0807C2A4: .4byte gUnknown_80F4448
+_0807C2A4: .4byte gAdjacentTileOffsets
_0807C2A8:
cmp r0, 0x50
beq _0807C2B0
@@ -12998,7 +12998,7 @@ _0807C2C0:
adds r0, r6, 0
adds r1, r4, 0
ldr r2, [sp, 0x18]
- bl sub_807C4A0
+ bl IsTargetInLineRange
lsls r0, 24
cmp r0, 0
beq _0807C370
@@ -13008,7 +13008,7 @@ _0807C2C0:
adds r1, r6, 0
adds r2, r4, 0
mov r3, r10
- bl sub_807C648
+ bl CanUseStatusMove
lsls r0, 24
cmp r0, 0
beq _0807C370
@@ -13016,7 +13016,7 @@ _0807C2C0:
adds r1, r4, 0
adds r2, r5, 0
ldr r3, [sp, 0x18]
- bl sub_807C9F8
+ bl IsTargetStraightAhead
lsls r0, 24
cmp r0, 0
beq _0807C370
@@ -13027,14 +13027,14 @@ _0807C2C0:
strb r5, [r0]
adds r0, r6, 0
mov r1, r10
- bl sub_8071A1C
+ bl GetMoveType_2
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
adds r0, r6, 0
ldr r1, [sp, 0xC]
adds r2, r4, 0
- bl sub_807C7AC
+ bl WeightMove
ldr r1, _0807C38C
mov r3, r8
lsls r2, r3, 2
@@ -13055,9 +13055,9 @@ _0807C370:
.align 2, 0
_0807C37C: .4byte gDungeonGlobalData
_0807C380: .4byte 0x000135cc
-_0807C384: .4byte gUnknown_202F380
+_0807C384: .4byte gCanAttackInDirection
_0807C388: .4byte gUnknown_202F388
-_0807C38C: .4byte gUnknown_202F390
+_0807C38C: .4byte gPotentialTargetWeights_2
_0807C390: .4byte gUnknown_202F3B0
_0807C394:
cmp r0, 0x60
@@ -13084,7 +13084,7 @@ _0807C39A:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r4, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
_0807C3CA:
adds r5, 0x1
@@ -13105,7 +13105,7 @@ _0807C3DC:
ldr r1, [sp, 0xC]
adds r2, r6, 0
adds r3, r6, 0
- bl sub_807C580
+ bl WeightMoveIfUsable
mov r8, r0
_0807C3F6:
mov r3, r8
@@ -13171,7 +13171,7 @@ _0807C450:
ldr r3, _0807C464
b _0807C470
.align 2, 0
-_0807C464: .4byte gUnknown_202F390
+_0807C464: .4byte gPotentialTargetWeights_2
_0807C468:
adds r3, 0x4
adds r1, 0x1
@@ -13205,10 +13205,10 @@ _0807C48C:
bx r1
.align 2, 0
_0807C49C: .4byte gUnknown_202F388
- thumb_func_end sub_807C04C
+ thumb_func_end FindMoveTarget
- thumb_func_start sub_807C4A0
-sub_807C4A0:
+ thumb_func_start IsTargetInLineRange
+IsTargetInLineRange:
push {r4-r7,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -13333,10 +13333,10 @@ _0807C57A:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807C4A0
+ thumb_func_end IsTargetInLineRange
- thumb_func_start sub_807C580
-sub_807C580:
+ thumb_func_start WeightMoveIfUsable
+WeightMoveIfUsable:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -13390,7 +13390,7 @@ _0807C5CE:
adds r1, r5, 0
adds r2, r7, 0
ldr r3, [sp, 0x24]
- bl sub_807C648
+ bl CanUseStatusMove
lsls r0, 24
cmp r0, 0
beq _0807C624
@@ -13402,14 +13402,14 @@ _0807C5CE:
strb r4, [r0]
adds r0, r5, 0
ldr r1, [sp, 0x24]
- bl sub_8071A1C
+ bl GetMoveType_2
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
adds r0, r5, 0
mov r1, r9
adds r2, r7, 0
- bl sub_807C7AC
+ bl WeightMove
ldr r1, _0807C640
lsls r2, r6, 2
adds r1, r2, r1
@@ -13429,14 +13429,14 @@ _0807C624:
pop {r1}
bx r1
.align 2, 0
-_0807C638: .4byte gUnknown_202F380
+_0807C638: .4byte gCanAttackInDirection
_0807C63C: .4byte gUnknown_202F388
-_0807C640: .4byte gUnknown_202F390
+_0807C640: .4byte gPotentialTargetWeights_2
_0807C644: .4byte gUnknown_202F3B0
- thumb_func_end sub_807C580
+ thumb_func_end WeightMoveIfUsable
- thumb_func_start sub_807C648
-sub_807C648:
+ thumb_func_start CanUseStatusMove
+CanUseStatusMove:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -13460,7 +13460,7 @@ sub_807C648:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13505,7 +13505,7 @@ _0807C6BE:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0807C6E0
@@ -13528,7 +13528,7 @@ _0807C6E4:
adds r0, r5, 0
adds r1, r4, 0
mov r2, r8
- bl sub_805CEB8
+ bl CanUseWithStatusChecker_2
lsls r0, 24
cmp r0, 0
beq _0807C6B2
@@ -13548,7 +13548,7 @@ _0807C6E4:
cmp r1, r0
bne _0807C720
adds r0, r4, 0
- bl sub_8070A58
+ bl HasNegativeStatus
b _0807C774
_0807C720:
movs r0, 0x80
@@ -13556,7 +13556,7 @@ _0807C720:
cmp r1, r0
bne _0807C730
adds r0, r4, 0
- bl sub_8070B28
+ bl IsSleeping
b _0807C774
_0807C730:
movs r0, 0xC0
@@ -13587,13 +13587,13 @@ _0807C75A:
cmp r1, r0
bne _0807C79E
adds r0, r4, 0
- bl sub_8070A58
+ bl HasNegativeStatus
lsls r0, 24
cmp r0, 0
bne _0807C79E
_0807C76E:
adds r0, r4, 0
- bl sub_8070B48
+ bl HasQuarterHPOrLess
_0807C774:
lsls r0, 24
cmp r0, 0
@@ -13625,10 +13625,10 @@ _0807C7A0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807C648
+ thumb_func_end CanUseStatusMove
- thumb_func_start sub_807C7AC
-sub_807C7AC:
+ thumb_func_start WeightMove
+WeightMove:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -13700,7 +13700,7 @@ _0807C828:
adds r0, r5, 0
mov r1, r8
mov r2, r9
- bl sub_806E654
+ bl WeightWeakTypePicker
adds r0, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -13713,10 +13713,10 @@ _0807C848:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807C7AC
+ thumb_func_end WeightMove
- thumb_func_start sub_807C854
-sub_807C854:
+ thumb_func_start TargetRegularAttack
+TargetRegularAttack:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -13796,7 +13796,7 @@ _0807C8BE:
bne _0807C948
adds r0, r7, 0
adds r1, r6, 0
- bl sub_8071138
+ bl CanAttackInFront
lsls r0, 24
cmp r0, 0
beq _0807C948
@@ -13804,7 +13804,7 @@ _0807C8BE:
adds r1, r5, 0
movs r2, 0
ldr r3, [sp, 0x44]
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13827,7 +13827,7 @@ _0807C922:
movs r1, 0
adds r2, r5, 0
movs r3, 0
- bl sub_807C7AC
+ bl WeightMove
add r1, sp, 0x20
adds r1, r4
str r0, [r1]
@@ -13849,7 +13849,7 @@ _0807C952:
movs r0, 0
b _0807C9E8
.align 2, 0
-_0807C95C: .4byte gUnknown_80F4448
+_0807C95C: .4byte gAdjacentTileOffsets
_0807C960:
ldr r1, [sp, 0x40]
str r6, [r1]
@@ -13939,10 +13939,10 @@ _0807C9E8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807C854
+ thumb_func_end TargetRegularAttack
- thumb_func_start sub_807C9F8
-sub_807C9F8:
+ thumb_func_start IsTargetStraightAhead
+IsTargetStraightAhead:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -14008,7 +14008,7 @@ _0807CA50:
movs r7, 0
b _0807CA94
.align 2, 0
-_0807CA70: .4byte gUnknown_80F4448
+_0807CA70: .4byte gAdjacentTileOffsets
_0807CA74:
adds r0, r5, 0
adds r1, r4, 0
@@ -14048,7 +14048,7 @@ _0807CAAE:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807C9F8
+ thumb_func_end IsTargetStraightAhead
thumb_func_start sub_807CABC
sub_807CABC:
@@ -14153,7 +14153,7 @@ _0807CB80:
stm r0!, {r2-r4}
ldm r1!, {r2-r4}
stm r0!, {r2-r4}
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _0807CBAC
@@ -14196,7 +14196,7 @@ _0807CBAC:
adds r2, r7, r3
adds r0, r4, 0
adds r1, r6, 0
- bl sub_807C04C
+ bl FindMoveTarget
ldrb r0, [r4]
cmp r0, 0
beq _0807CC08
@@ -14207,7 +14207,7 @@ _0807CBAC:
adds r1, 0x46
strb r0, [r1]
adds r0, r6, 0
- bl sub_8069DCC
+ bl TargetTileInFront
_0807CC08:
adds r0, r7, 0
adds r0, 0xBC
@@ -14372,8 +14372,8 @@ _0807CD54:
bx r0
thumb_func_end sub_807CB3C
- thumb_func_start sub_807CD64
-sub_807CD64:
+ thumb_func_start GetTargetingFlags
+GetTargetingFlags:
push {r4,r5,lr}
adds r3, r0, 0
adds r4, r1, 0
@@ -14385,7 +14385,7 @@ sub_807CD64:
bne _0807CD88
adds r0, r3, 0
movs r1, 0xE
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
bne _0807CD88
@@ -14401,7 +14401,7 @@ _0807CD94:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_807CD64
+ thumb_func_end GetTargetingFlags
thumb_func_start sub_807CD9C
sub_807CD9C:
@@ -14416,7 +14416,7 @@ sub_807CD9C:
adds r4, r2, 0
movs r0, 0xA
str r0, [sp, 0x24]
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
beq _0807CDC4
@@ -14724,7 +14724,7 @@ _0807D02A:
.align 2, 0
_0807D03C: .4byte 0x000001a3
_0807D040: .4byte gUnknown_80F8A0C
-_0807D044: .4byte gUnknown_80F4448
+_0807D044: .4byte gAdjacentTileOffsets
_0807D048: .4byte 0xffff0000
_0807D04C: .4byte 0x0000ffff
_0807D050: .4byte gUnknown_80F4F90
@@ -14881,7 +14881,7 @@ sub_807D148:
_0807D180: .4byte gAvailablePokemonNames
_0807D184: .4byte gUnknown_80FCAE8
_0807D188:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
beq _0807D1A4
@@ -15973,7 +15973,7 @@ sub_807DA14:
_0807DA48: .4byte gAvailablePokemonNames
_0807DA4C: .4byte gUnknown_80FCB98
_0807DA50:
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
beq _0807DA6C
@@ -16056,7 +16056,7 @@ _0807DA8C:
bl sub_803E46C
b _0807DA8C
.align 2, 0
-_0807DAFC: .4byte gUnknown_80F4448
+_0807DAFC: .4byte gAdjacentTileOffsets
_0807DB00:
adds r0, r6, 0
bl sub_806A5B8
@@ -16120,7 +16120,7 @@ sub_807DB74:
adds r7, r0, 0
movs r0, 0
mov r8, r0
- bl sub_80441E8
+ bl IsFixedDungeon
lsls r0, 24
cmp r0, 0
beq _0807DB94
@@ -16129,7 +16129,7 @@ sub_807DB74:
.align 2, 0
_0807DB90: .4byte gUnknown_80FD060
_0807DB94:
- bl sub_804AF74
+ bl IsWaterTileset
lsls r0, 24
cmp r0, 0
beq _0807DBB0
@@ -16150,7 +16150,7 @@ _0807DBB6:
_0807DBB8:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -16264,7 +16264,7 @@ _0807DC94:
_0807DCA4: .4byte 0x00003a0b
_0807DCA8: .4byte gUnknown_80FD3CC
_0807DCAC:
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _0807DCC8
@@ -16290,7 +16290,7 @@ _0807DCD8:
movs r6, 0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
ldr r3, _0807DD6C
@@ -16413,7 +16413,7 @@ _0807DDC8:
_0807DDCA:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r3, 0x80
@@ -16460,7 +16460,7 @@ _0807DE1A:
beq _0807DE30
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8049590
+ bl GetMapEntity
ldrh r2, [r0]
movs r1, 0x40
orrs r1, r2
@@ -16643,7 +16643,7 @@ _0807DFAC: .4byte 0x000135cc
_0807DFB0: .4byte gAvailablePokemonNames
_0807DFB4:
mov r0, r10
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -16721,7 +16721,7 @@ _0807E014:
bgt _0807E112
cmp r1, 0x1F
bgt _0807E112
- bl sub_8049590
+ bl GetMapEntity
mov r8, r0
ldr r0, [sp, 0x18]
movs r2, 0
@@ -16920,7 +16920,7 @@ sub_807E1A0:
asrs r4, r5, 1
adds r0, r6, 0
movs r1, 0x2
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0807E202
@@ -16938,7 +16938,7 @@ _0807E210:
ldr r4, [sp, 0x40]
adds r0, r6, 0
movs r1, 0x2
- bl sub_8071858
+ bl HasType
lsls r0, 24
cmp r0, 0
beq _0807E226
@@ -17105,7 +17105,7 @@ _0807E374: .4byte 0x00003a08
thumb_func_start sub_807E378
sub_807E378:
push {r4-r7,lr}
- bl sub_8083600
+ bl GetLeaderEntity
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -17155,7 +17155,7 @@ _0807E3D0:
movs r1, 0x1
bl sub_806A2BC
adds r0, r4, 0
- bl sub_807520C
+ bl UseAttack
bl sub_8044B28
lsls r0, 24
cmp r0, 0
@@ -17205,7 +17205,7 @@ _0807E446:
movs r1, 0x1
bl sub_806A2BC
adds r0, r4, 0
- bl sub_807520C
+ bl UseAttack
bl sub_8044B28
lsls r0, 24
cmp r0, 0
@@ -17251,7 +17251,7 @@ _0807E4A0:
movs r1, 0x1
bl sub_806A2BC
adds r0, r4, 0
- bl sub_807520C
+ bl UseAttack
bl sub_8044B28
lsls r0, 24
cmp r0, 0
@@ -17293,7 +17293,7 @@ _0807E508:
movs r1, 0x1
bl sub_806A2BC
adds r0, r4, 0
- bl sub_807520C
+ bl UseAttack
bl sub_8044B28
lsls r0, 24
cmp r0, 0
@@ -17333,8 +17333,8 @@ _0807E578: .4byte 0x00003a0e
_0807E57C: .4byte 0x0000021e
thumb_func_end sub_807E378
- thumb_func_start sub_807E580
-sub_807E580:
+ thumb_func_start GetWeather
+GetWeather:
push {lr}
cmp r0, 0
beq _0807E596
@@ -17357,7 +17357,7 @@ _0807E5A0:
.align 2, 0
_0807E5A4: .4byte gDungeonGlobalData
_0807E5A8: .4byte 0x0000e264
- thumb_func_end sub_807E580
+ thumb_func_end GetWeather
thumb_func_start sub_807E5AC
sub_807E5AC:
@@ -17375,7 +17375,7 @@ sub_807E5AC:
lsrs r0, 24
_0807E5C6:
bl sub_807E5E4
- bl sub_8069E8C
+ bl TriggerWeatherAbilities
movs r0, 0
movs r1, 0x1
bl sub_807EAA0
@@ -17485,7 +17485,7 @@ sub_807E698:
lsrs r0, 24
str r0, [sp]
movs r0, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 16
str r0, [sp, 0x4]
@@ -17494,7 +17494,7 @@ sub_807E698:
ldr r0, [r0, 0x4]
mov r10, r0
movs r0, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -17674,7 +17674,7 @@ sub_807E7FC:
ldr r5, [r0]
cmp r5, 0
bne _0807E816
- bl sub_8083600
+ bl GetLeaderEntity
adds r5, r0, 0
_0807E816:
cmp r4, 0
@@ -17687,7 +17687,7 @@ _0807E816:
bne _0807E844
ldr r4, _0807E880
movs r0, 0
- bl sub_807E580
+ bl GetWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -17734,7 +17734,7 @@ _0807E888: .4byte 0x000135cc
sub_807E88C:
push {r4-r7,lr}
movs r0, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
ldr r1, _0807E8E4
ldr r1, [r1]
@@ -17812,7 +17812,7 @@ _0807E90E:
ldrb r0, [r7]
strb r0, [r1, 0x1]
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r0, r5, 0
movs r1, 0x25
bl HasAbility
@@ -17820,7 +17820,7 @@ _0807E90E:
cmp r0, 0
beq _0807E958
adds r0, r5, 0
- bl sub_807E580
+ bl GetWeather
ldr r1, _0807E954
lsls r0, 24
lsrs r0, 22
@@ -17959,7 +17959,7 @@ sub_807EA30:
ldr r2, _0807EA64
adds r1, r2
strb r0, [r1]
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _0807EA68
ldr r1, [r1]
bl SendMessage
@@ -17979,7 +17979,7 @@ _0807EA6C:
ldr r2, _0807EA98
adds r1, r2
strb r0, [r1]
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _0807EA9C
ldr r1, [r1]
bl SendMessage
@@ -18014,7 +18014,7 @@ sub_807EAA0:
mov r9, r1
movs r2, 0
str r2, [sp, 0x8]
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -18095,7 +18095,7 @@ _0807EB4E:
strb r0, [r1]
_0807EB64:
movs r0, 0
- bl sub_807E580
+ bl GetWeather
lsls r0, 24
lsrs r0, 24
cmp r10, r0
@@ -18142,7 +18142,7 @@ _0807EBA6:
ldrb r0, [r0]
cmp r0, 0
bne _0807EBD4
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _0807EC1C
ldr r1, [r1]
bl SendMessage
@@ -18162,7 +18162,7 @@ _0807EBD4:
ldrb r0, [r0]
cmp r0, 0
bne _0807EC00
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _0807EC24
ldr r1, [r1]
bl SendMessage
@@ -18201,7 +18201,7 @@ sub_807EC28:
beq _0807EC46
b _0807EF32
_0807EC46:
- bl sub_8083600
+ bl GetLeaderEntity
adds r7, r0, 0
ldr r0, [r7, 0x70]
mov r9, r0
@@ -18635,7 +18635,7 @@ sub_807EF84:
adds r4, r0, 0
cmp r4, 0
beq _0807EFE2
- bl sub_8083600
+ bl GetLeaderEntity
bl sub_8045128
ldrh r1, [r0]
movs r0, 0x20
@@ -19086,7 +19086,7 @@ sub_807F33C:
ldr r2, _0807F424
adds r0, r2
strb r1, [r0]
- bl sub_8083600
+ bl GetLeaderEntity
ldr r1, _0807F428
ldr r1, [r1]
bl SendMessage
@@ -19156,7 +19156,7 @@ _0807F3BC:
movs r0, 0
strb r0, [r4, 0x8]
adds r0, r5, 0
- bl sub_8070774
+ bl GetMovementSpeed
adds r4, 0x60
ldrb r1, [r4]
movs r0, 0x1
@@ -19291,7 +19291,7 @@ _0807F4E4:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -19307,7 +19307,7 @@ _0807F50C:
adds r1, r4, 0
movs r2, 0
movs r3, 0x1
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
cmp r0, 0
bne _0807F602
@@ -19368,7 +19368,7 @@ _0807F570:
b _0807F602
.align 2, 0
_0807F588: .4byte 0xffff0000
-_0807F58C: .4byte gUnknown_80F4448
+_0807F58C: .4byte gAdjacentTileOffsets
_0807F590: .4byte 0x0000ffff
_0807F594:
movs r5, 0
@@ -19453,7 +19453,7 @@ _0807F61C:
adds r6, r5, 0
b _0807F654
.align 2, 0
-_0807F630: .4byte gUnknown_80F4448
+_0807F630: .4byte gAdjacentTileOffsets
_0807F634: .4byte 0xffff0000
_0807F638: .4byte 0x0000ffff
_0807F63C:
@@ -19720,7 +19720,7 @@ _0807F7FC:
_0807F860: .4byte gAvailablePokemonNames
_0807F864: .4byte gUnknown_80FE690
_0807F868: .4byte 0x000001a3
-_0807F86C: .4byte gUnknown_80F4448
+_0807F86C: .4byte gAdjacentTileOffsets
_0807F870:
ldr r0, [r7]
str r0, [sp, 0xD4]
@@ -19772,7 +19772,7 @@ _0807F8BE:
bl sub_807D148
b _0807F8FA
.align 2, 0
-_0807F8D0: .4byte gUnknown_80F4448
+_0807F8D0: .4byte gAdjacentTileOffsets
_0807F8D4: .4byte 0xffff0000
_0807F8D8: .4byte 0x0000ffff
_0807F8DC:
@@ -19936,7 +19936,7 @@ _0807FA1E:
_0807FA22:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
ldrh r1, [r4, 0x4]
movs r0, 0x4
@@ -20240,15 +20240,15 @@ _0807FC78: .4byte 0x00013576
_0807FC7C: .4byte 0x00013579
thumb_func_end sub_807FC3C
- thumb_func_start sub_807FC80
-sub_807FC80:
+ thumb_func_start CanLayTrap
+CanLayTrap:
push {lr}
movs r1, 0
ldrsh r2, [r0, r1]
movs r3, 0x2
ldrsh r1, [r0, r3]
adds r0, r2, 0
- bl sub_8049590
+ bl GetMapEntity
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x80
@@ -20285,7 +20285,7 @@ _0807FCCE:
_0807FCD0:
pop {r1}
bx r1
- thumb_func_end sub_807FC80
+ thumb_func_end CanLayTrap
thumb_func_start sub_807FCD4
sub_807FCD4:
@@ -20302,7 +20302,7 @@ sub_807FCD4:
ldrsh r0, [r7, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r6, r0, 0
cmp r5, 0x13
bls _0807FD12
@@ -20456,7 +20456,7 @@ sub_807FE04:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r2, r3]
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
ldr r0, [r4, 0x14]
cmp r0, 0
@@ -20550,7 +20550,7 @@ sub_807FE9C:
ldrsh r0, [r1, r2]
movs r3, 0x2
ldrsh r1, [r1, r3]
- bl sub_8049590
+ bl GetMapEntity
str r0, [sp, 0x4]
ldr r0, [r0, 0x14]
mov r10, r0
@@ -21362,7 +21362,7 @@ sub_8080504:
bne _0808051A
b _0808060E
_0808051A:
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _08080534
@@ -21498,7 +21498,7 @@ sub_8080620:
movs r0, 0x8
bl DungeonRandomCapped
adds r5, r0, 0
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
bne _080806CA
@@ -21571,7 +21571,7 @@ _080806CA:
bl SendMessage
b _080806EA
.align 2, 0
-_080806D8: .4byte gUnknown_80F4448
+_080806D8: .4byte gAdjacentTileOffsets
_080806DC: .4byte gUnknown_80FED04
_080806E0:
ldr r0, _080806FC
@@ -21828,7 +21828,7 @@ sub_80808A4:
ldr r1, _080808D4
adds r0, r1
ldrb r4, [r0]
- bl sub_80441BC
+ bl IsBossBattle
lsls r0, 24
cmp r0, 0
beq _080808DC
@@ -22108,7 +22108,7 @@ _08080AEC:
pop {r0}
bx r0
.align 2, 0
-_08080AF4: .4byte gUnknown_80F4448
+_08080AF4: .4byte gAdjacentTileOffsets
_08080AF8: .4byte 0xffff0000
_08080AFC: .4byte 0x0000ffff
thumb_func_end sub_8080A5C
@@ -24698,7 +24698,7 @@ _080820FC:
mov r3, sp
movs r2, 0x6
ldrsh r1, [r3, r2]
- bl sub_8049590
+ bl GetMapEntity
adds r4, r0, 0
ldrb r0, [r7]
mov r3, r9
@@ -25260,7 +25260,7 @@ _080824DC:
b _08082678
.align 2, 0
_0808266C: .4byte 0xfffffd60
-_08082670: .4byte gUnknown_203B450
+_08082670: .4byte gLeaderPokemon
_08082674: .4byte 0x0000010d
_08082678:
ldr r1, _08082818
@@ -25447,7 +25447,7 @@ _08082830: .4byte 0x00000155
_08082834: .4byte 0x00000165
_08082838: .4byte 0x00000167
_0808283C: .4byte 0x00000169
-_08082840: .4byte gUnknown_203B450
+_08082840: .4byte gLeaderPokemon
_08082844:
mov r0, sp
movs r1, 0x2
@@ -25472,7 +25472,7 @@ _08082856:
add r3, sp
movs r2, 0
ldrsh r1, [r3, r2]
- bl sub_8049590
+ bl GetMapEntity
ldr r1, [r4]
str r1, [r7, 0x8]
ldr r1, [r4]
@@ -25503,7 +25503,7 @@ _08082856:
strh r1, [r0, 0x2]
_080828B0:
adds r0, r7, 0
- bl sub_807191C
+ bl LoadIQSkills
adds r0, r7, 0
movs r1, 0
bl sub_804535C
@@ -25520,7 +25520,7 @@ _080828BE:
bx r0
.align 2, 0
_080828D4: .4byte 0x0000020a
-_080828D8: .4byte gUnknown_203B450
+_080828D8: .4byte gLeaderPokemon
_080828DC: .4byte gUnknown_203B410
thumb_func_end sub_8082280
@@ -25885,7 +25885,7 @@ _08082B46:
ldrsh r0, [r5, r1]
movs r2, 0x6
ldrsh r1, [r5, r2]
- bl sub_8049590
+ bl GetMapEntity
ldrb r1, [r0, 0x9]
adds r0, r5, 0
adds r0, 0x25
@@ -26888,8 +26888,8 @@ sub_8083288:
bx r0
thumb_func_end sub_8083288
- thumb_func_start sub_8083294
-sub_8083294:
+ thumb_func_start InSameRoom_2
+InSameRoom_2:
push {r4-r7,lr}
adds r4, r0, 0
adds r6, r1, 0
@@ -26978,10 +26978,10 @@ _08083330:
bx r1
.align 2, 0
_08083338: .4byte 0x000104c4
- thumb_func_end sub_8083294
+ thumb_func_end InSameRoom_2
- thumb_func_start sub_808333C
-sub_808333C:
+ thumb_func_start InSameRoom_3
+InSameRoom_3:
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -27061,7 +27061,7 @@ _080833CC:
bne _080833DE
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8083478
+ bl IsTargetTwoTilesAway
lsls r0, 24
cmp r0, 0
beq _080833BE
@@ -27071,7 +27071,7 @@ _080833E0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_808333C
+ thumb_func_end InSameRoom_3
thumb_func_start sub_80833E8
sub_80833E8:
@@ -27148,8 +27148,8 @@ _0808346A:
_08083474: .4byte 0x000104c4
thumb_func_end sub_80833E8
- thumb_func_start sub_8083478
-sub_8083478:
+ thumb_func_start IsTargetTwoTilesAway
+IsTargetTwoTilesAway:
push {r4-r7,lr}
sub sp, 0x4
adds r3, r0, 0
@@ -27287,7 +27287,7 @@ _08083560:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8083478
+ thumb_func_end IsTargetTwoTilesAway
thumb_func_start sub_8083568
sub_8083568:
@@ -27364,8 +27364,8 @@ _080835FA:
bx r1
thumb_func_end sub_8083568
- thumb_func_start sub_8083600
-sub_8083600:
+ thumb_func_start GetLeaderEntity
+GetLeaderEntity:
push {r4,r5,lr}
ldr r0, _08083638
ldr r0, [r0]
@@ -27396,7 +27396,7 @@ _0808362E:
movs r0, 0
b _0808364A
.align 2, 0
-_08083638: .4byte gUnknown_203B450
+_08083638: .4byte gLeaderPokemon
_0808363C: .4byte gDungeonGlobalData
_08083640: .4byte 0x0001357c
_08083644:
@@ -27408,13 +27408,13 @@ _0808364A:
pop {r1}
bx r1
.align 2, 0
-_08083650: .4byte gUnknown_203B450
- thumb_func_end sub_8083600
+_08083650: .4byte gLeaderPokemon
+ thumb_func_end GetLeaderEntity
thumb_func_start sub_8083654
sub_8083654:
push {lr}
- bl sub_8083600
+ bl GetLeaderEntity
ldr r0, [r0, 0x70]
pop {r1}
bx r1
@@ -27433,7 +27433,7 @@ sub_8083660:
lsls r1, 5
add r1, sp
str r0, [r1]
- bl sub_8083600
+ bl GetLeaderEntity
ldr r2, _080836D8
add r2, sp
str r0, [r2]
@@ -27814,7 +27814,7 @@ sub_8083904:
adds r0, r1
b _08083A6E
.align 2, 0
-_08083950: .4byte gUnknown_80F4448
+_08083950: .4byte gAdjacentTileOffsets
_08083954:
ldr r1, [r4, 0x58]
movs r0, 0x1
@@ -27922,7 +27922,7 @@ _08083A00:
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8071598
+ bl CanTarget
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -27968,7 +27968,7 @@ _08083A6E:
b _08083A9E
.align 2, 0
_08083A78: .4byte 0x0001357c
-_08083A7C: .4byte gUnknown_80F4448
+_08083A7C: .4byte gAdjacentTileOffsets
_08083A80:
mov r3, r9
ldr r2, [sp]
@@ -28851,8 +28851,8 @@ sub_80840D8:
_080840E4: .4byte gUnknown_203B454
thumb_func_end sub_80840D8
- thumb_func_start sub_80840E8
-sub_80840E8:
+ thumb_func_start GetRandomNumber
+GetRandomNumber:
ldr r2, _080840F8
ldr r1, [r2]
ldr r0, _080840FC
@@ -28864,13 +28864,13 @@ sub_80840E8:
.align 2, 0
_080840F8: .4byte gUnknown_203B454
_080840FC: .4byte 0x5d588b65
- thumb_func_end sub_80840E8
+ thumb_func_end GetRandomNumber
thumb_func_start DungeonRandomCapped
DungeonRandomCapped:
push {r4,lr}
adds r4, r0, 0
- bl sub_80840E8
+ bl GetRandomNumber
ldr r1, _08084118
ands r0, r1
muls r0, r4
@@ -29312,7 +29312,7 @@ sub_8084448:
adds r5, r0, 0
ldr r7, [r5, 0x70]
ldr r4, _0808447C
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -29506,7 +29506,7 @@ sub_80845E0:
movs r1, 0
mov r9, r1
ldr r4, _08084620
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s
index 6fa181d..3ef188c 100644
--- a/asm/code_80848F0.s
+++ b/asm/code_80848F0.s
@@ -272,7 +272,7 @@ _0808547C: .4byte gUnknown_80F4598
thumb_func_start sub_8085480
sub_8085480:
push {lr}
- bl sub_8083600
+ bl GetLeaderEntity
pop {r1}
bx r1
thumb_func_end sub_8085480
@@ -794,7 +794,7 @@ _08085840:
bx r0
.align 2, 0
_08085854: .4byte gDungeonGlobalData
-_08085858: .4byte gUnknown_80F4448
+_08085858: .4byte gAdjacentTileOffsets
_0808585C: .4byte 0x000135cc
thumb_func_end sub_80857B8
diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s
index 2a05dfe..e79e550 100644
--- a/asm/code_8085B0C.s
+++ b/asm/code_8085B0C.s
@@ -176,7 +176,7 @@ _08085C3E:
pop {r1}
bx r1
.align 2, 0
-_08085C4C: .4byte gUnknown_80F4448
+_08085C4C: .4byte gAdjacentTileOffsets
_08085C50: .4byte gUnknown_202F3D8
thumb_func_end sub_8085B80
diff --git a/asm/code_8094148.s b/asm/code_8094148.s
index 66feab4..8a2e077 100644
--- a/asm/code_8094148.s
+++ b/asm/code_8094148.s
@@ -279,8 +279,8 @@ _08094448: .4byte 0xffff0000
_0809444C: .4byte 0x0000ffff
thumb_func_end sub_80943DC
- thumb_func_start sub_8094450
-sub_8094450:
+ thumb_func_start GetBellyRoundedUp
+GetBellyRoundedUp:
push {lr}
adds r1, r0, 0
lsls r0, r1, 16
@@ -306,7 +306,7 @@ _08094474:
_08094476:
pop {r1}
bx r1
- thumb_func_end sub_8094450
+ thumb_func_end GetBellyRoundedUp
thumb_func_start sub_809447C
sub_809447C:
diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s
index 85a8d1c..4d113bb 100644
--- a/asm/jirachi_wish.s
+++ b/asm/jirachi_wish.s
@@ -157,7 +157,7 @@ _0808B6D2:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -241,7 +241,7 @@ _0808B77E:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -321,7 +321,7 @@ _0808B87C:
bl UnlockFriendArea
movs r0, 0xD4
bl PlaySoundEffect
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
ldr r0, _0808BA3C
movs r2, 0
@@ -391,7 +391,7 @@ _0808B8F4:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -442,7 +442,7 @@ _0808B98E:
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
adds r1, 0x4
adds r0, r6, 0x4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 10:34:47 +0000