Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Matched overlay 31 JP

Browse Source
This commit is contained in:
AnonymousRandomPerson 2024-06-22 21:42:04 -05:00
parent 3f64d749da
commit 6115e36be7
28 changed files with 1249 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asm/include/overlay_29_02308FE0.inc
View File

@ -259,6 +259,7 @@
.public SpawnDroppedItemWrapper
.public SpawnMonster
.public SPECIAL_BAND_STAT_BOOST
.public StrcpySimple
.public StringFromId
.public StrncpyName
.public StrncpySimpleNoPad

2
asm/include/overlay_31.inc
View File

@ -63,6 +63,7 @@
.public GetRecruitRate2
.public GetSpeciesString
.public GetStringFromFileVeneer
.public GetTeamMember
.public GetTeamMemberIndex
.public GetTile
.public GetTrapInfo
@ -241,6 +242,7 @@
.public sub_02054F44
.public sub_02056228
.public sub_020585B4
.public TeamMemberHasEnabledIqSkill
.public TryPointCameraToMonster
.public UpdateMapSurveyorFlag
.public UpdateWindow

4
asm/overlay_29_022DC2B8.s
View File

@ -3800,11 +3800,13 @@ _022DF4E4:
ldrsh r3, [r2, r3]
#ifdef JAPAN
add r0, r0, #0x3d00
mov r2, #0
strh r3, [r0, #0x96]
#else
add r0, r0, #0x3e00
#endif
mov r2, #0
strh r3, [r0, #0x3a + RUN_DUNGEON_OFFSET]
#endif
ldr r0, [r1]
add r0, r0, #0x3000
strb r2, [r0, #0xe39 + RUN_DUNGEON_OFFSET]

11
asm/overlay_29_022E0378.s
View File

@ -1424,9 +1424,9 @@ _022E142C:
strh r3, [r2, r0]
cmp r4, #9
blt _022E142C
ldr r3, _022E1504 ; =0x0000F2F0
ldr r1, _022E14F8 ; =DUNGEON_PTR
#ifdef JAPAN
ldr r2, _022E1504 ; =0x0000F2F0
ldr r1, _022E14F8 ; =DUNGEON_PTR
mov r7, #0x2f0
mov r3, #0
_022E2AE4:
@ -1470,6 +1470,8 @@ _022E2B44:
add r8, r8, #1
cmp r8, #3
#else
ldr r3, _022E1504 ; =0x0000F2F0
ldr r1, _022E14F8 ; =DUNGEON_PTR
ldr r0, _022E1508 ; =0x0001212C
mov r6, #0x2f0
mov r4, #0
@ -1761,8 +1763,13 @@ _022E1770:
mov r3, #0xb8
_022E1798:
ldr r6, [r4]
#ifdef JAPAN
add r2, r6, #0x388
add r2, r2, #0x13800
#else
add r2, r6, #0x2c
add r2, r2, #0x13c00
#endif
mla r5, r0, r3, r2
add r2, r6, r0, lsl #2
add r2, r2, #0x12000

35
asm/overlay_29_022E1A40.s
View File

@ -978,9 +978,9 @@ _022E2570: .word DUNGEON_PTR
arm_func_start ShouldDisplayEntity
ShouldDisplayEntity: ; 0x022E2574
#ifdef JAPAN
#define SHOULD_DISPLAY_ENTITY -0xA4
#define SHOULD_DISPLAY_ENTITY_OFFSET -0xA4
#else
#define SHOULD_DISPLAY_ENTITY 0
#define SHOULD_DISPLAY_ENTITY_OFFSET 0
#endif
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldrb r5, [r0, #0x20]
@ -1028,7 +1028,7 @@ _022E2600:
addle r2, r6, #0xc0
cmple r7, r2
bgt _022E271C
add r2, r4, #0x21c + SHOULD_DISPLAY_ENTITY
add r2, r4, #0x21c + SHOULD_DISPLAY_ENTITY_OFFSET
cmp lr, #6
add r6, r2, #0x1a000
addls pc, pc, lr, lsl #2
@ -1059,7 +1059,7 @@ _022E267C:
moveq r0, #1
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
add r2, r4, #0x1a000
ldrb r2, [r2, #0x244 + SHOULD_DISPLAY_ENTITY]
ldrb r2, [r2, #0x244 + SHOULD_DISPLAY_ENTITY_OFFSET]
cmp r2, #0
ldreqb r2, [r3, #0xef]
cmpeq r2, #1
@ -1085,7 +1085,7 @@ _022E26DC:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_022E26F0:
add r0, r4, #0x1a000
ldrb r0, [r0, #0x244 + SHOULD_DISPLAY_ENTITY]
ldrb r0, [r0, #0x244 + SHOULD_DISPLAY_ENTITY_OFFSET]
cmp r0, #0
cmpeq r5, #0
bne _022E2714
@ -1102,7 +1102,7 @@ _022E271C:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E2724: .word DUNGEON_PTR
_022E2728: .word 0x0001A224
_022E2728: .word 0x0001A224 + SHOULD_DISPLAY_ENTITY_OFFSET
arm_func_end ShouldDisplayEntity
arm_func_start ShouldDisplayEntityWrapper
@ -1488,16 +1488,17 @@ _022E34E8: .word 0x02354138
arm_func_start ov29_022E2B68
ov29_022E2B68: ; 0x022E2B68
#ifdef JAPAN
#define OV29_022E2B68_OFFSET -0xA4
#else
#define OV29_022E2B68_OFFSET 0
#endif
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _022E2C5C ; =DUNGEON_PTR
movs r5, r0
ldr r2, [r1]
mov r1, #0
#ifdef JAPAN
add r0, r2, #0x178
#else
add r0, r2, #0x21c
#endif
add r0, r2, #0x21c + OV29_022E2B68_OFFSET
add r4, r0, #0x1a000
strh r1, [r4, #8]
ldr r0, _022E2C60 ; =0x0001A21C
@ -1548,11 +1549,7 @@ _022E2BF4:
ldr r0, _022E2C5C ; =DUNGEON_PTR
ldr r0, [r0]
add r0, r0, #0x28000
#ifdef JAPAN
ldrb r0, [r0, #0x624]
#else
ldrb r0, [r0, #0x6c8]
#endif
ldrb r0, [r0, #0x6c8 + OV29_022E2B68_OFFSET]
ands r0, r0, #3
strb r0, [r4, #0x21]
moveq r0, #1
@ -1560,7 +1557,7 @@ _022E2BF4:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022E2C5C: .word DUNGEON_PTR
_022E2C60: .word 0x0001A21C
_022E2C60: .word 0x0001A21C + OV29_022E2B68_OFFSET
_022E2C64: .word 0x0000FFFF
_022E2C68: .word ov29_0237C84C
arm_func_end ov29_022E2B68
@ -1633,7 +1630,11 @@ _022E2D2C:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022E2D34: .word DUNGEON_PTR
#ifdef JAPAN
_022E2D38: .word 0x0001A178
#else
_022E2D38: .word 0x0001A21C
#endif
arm_func_end ov29_022E2CA0
arm_func_start ov29_022E2D3C

4
asm/overlay_29_022E330C.s
View File

@ -411,5 +411,9 @@ _022E37A8:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E37B0: .word DUNGEON_PTR
#ifdef JAPAN
_022E37B4: .word 0x0001A182
#else
_022E37B4: .word 0x0001A226
#endif
arm_func_end PlayEffectAnimationEntity

6
asm/overlay_29_022E37DC.s
View File

@ -2967,7 +2967,11 @@ _022E5BC8:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022E5BD0: .word DUNGEON_PTR
#ifdef JAPAN
_022E5BD4: .word 0x0001A182
#else
_022E5BD4: .word 0x0001A226
#endif
arm_func_end ov29_022E5AE4
arm_func_start ov29_022E5BD8
@ -5165,7 +5169,7 @@ _022E77D4:
add r0, r4, #0x164
add r0, r0, #0x2c800
#endif
ldrb r2, [r2, #0xda]
ldrb r2, [r2, #0xda + LOAD_MAPPA_FILE_ATTRIBUTES_OFFSET]
ldrsh r3, [r4, r3]
add r0, r0, r8, lsl #3
bl LoadFixedRoom

4
asm/overlay_29_022E9618.s
View File

@ -1503,7 +1503,11 @@ _022EA954:
.align 2, 0
_022EA95C: .word ov29_0237C850
_022EA960: .word DUNGEON_PTR
#ifdef JAPAN
_022EA964: .word 0x0001A180
#else
_022EA964: .word 0x0001A224
#endif
arm_func_end ov29_022EA80C
arm_func_start SetDungeonRngPreseed23Bit

4
asm/overlay_29_022EAB50.s
View File

@ -285,7 +285,11 @@ ov29_022EAE40: ; 0x022EAE40
ldr r0, [lr]
sub r2, r2, #2
add r0, r0, #0x2c000
#ifdef JAPAN
str r3, [r0, #0xa54]
#else
str r3, [r0, #0xaf8]
#endif
ldr r0, [lr]
mov r3, #0
strh r3, [r0, r2]

6
asm/overlay_29_022EC62C.s
View File

@ -106,7 +106,11 @@ _022EC750:
beq _022EC7C8
ldr r0, [sb, #0xb4]
mov r1, #0x3f
strb r7, [r0, #0x152 + TRY_SPAWN_MONSTER_AND_ACTIVATE_PLUS_MINUS_OFFSET]
#ifdef JAPAN
strb r7, [r0, #0x14e]
#else
strb r7, [r0, #0x152]
#endif
ldrb r0, [r0, #6]
cmp r0, #0
moveq sl, fp

4
asm/overlay_29_022EE36C.s
View File

@ -472,10 +472,10 @@ _022EE8AC:
beq _022EE90C
mov r2, #1
#ifdef JAPAN
strb r2, [r5, #0x16e]
strb r2, [r8, #0x16e]
mov r0, #0x28
mov r1, #0x4b
strb r2, [r5, #0x170]
strb r2, [r8, #0x170]
bl ov29_022EA370
ldr r1, _022EE988 ; =ov10_022C44E4
mov r0, r6

12
asm/overlay_29_022F05B4.s
View File

@ -2050,7 +2050,11 @@ _022F2180:
ldr r0, _022F1DDC ; =DUNGEON_PTR
ldr r0, [r0]
add r0, r0, #0x1a000
ldrb r0, [r0, #0x23e + SET_LEADER_ACTION_OFFSET]
#ifdef JAPAN
ldrb r0, [r0, #0x19a]
#else
ldrb r0, [r0, #0x23e]
#endif
cmp r0, #0
bne _022F21B4
ldr r0, _022F1DF0 ; =ov29_0237C694
@ -5071,14 +5075,15 @@ _022F4B24:
movlt r0, #0
strltb r0, [r6, #1]
blt _022F4B70
ldr r2, _022F4BD0 ; =DUNGEON_PTR
#ifdef JAPAN
ldr r1, _022F4BD0 ; =DUNGEON_PTR
mov r2, #0x23c
ldr r1, [r1]
add r1, r1, #0x3f4
add r1, r1, #0x400
mla r0, r2, r0, r1
#else
ldr r2, _022F4BD0 ; =DUNGEON_PTR
add r1, r0, r0, lsl #3
ldr r0, [r2]
add r0, r0, #0x3f4
@ -5414,8 +5419,8 @@ _022F4F94:
bl ov29_02346FB8
cmp r0, #0
blt _022F4FD0
ldr r1, _022F5050 ; =DUNGEON_PTR
#ifdef JAPAN
ldr r2, _022F5050 ; =DUNGEON_PTR
mov r1, #0x23c
ldr r3, [r2]
ldrh r2, [sp]
@ -5423,6 +5428,7 @@ _022F4F94:
add r0, r1, #0x800
strh r2, [r0, #0x56]
#else
ldr r1, _022F5050 ; =DUNGEON_PTR
add r0, r0, r0, lsl #3
ldr r2, [r1]
ldrh r1, [sp]

4
asm/overlay_29_022F52B0.s
View File

@ -1011,7 +1011,11 @@ _022F5E84:
mov r1, r6
mov r0, #0
mov r2, #1
#ifdef JAPAN
bl DisplayMessage2
#else
bl DisplayMessage
#endif
_022F5F04:
add sp, sp, #0x44
ldmia sp!, {r4, r5, r6, r7, pc}

4
asm/overlay_29_022F7388.s
View File

@ -2571,7 +2571,11 @@ _022F92C0:
blt _022F925C
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
#ifdef JAPAN
_022F92D0: .word 0x00000956
#else
_022F92D0: .word 0x00000C17
#endif
_022F92D4: .word DUNGEON_PTR
arm_func_end TryActivateSlowStart

8
asm/overlay_29_022FC9C0.s
View File

@ -513,8 +513,10 @@ _022FD080: .word DUNGEON_PTR
SpawnMonster: ; 0x022FD084
#ifdef JAPAN
#define SPAWN_MONSTER_OFFSET -0xA4
#define SPAWN_MONSTER_OFFSET_2 -4
#else
#define SPAWN_MONSTER_OFFSET 0
#define SPAWN_MONSTER_OFFSET_2 0
#endif
stmdb sp!, {r3, r4, r5, r6, r7, lr}
sub sp, sp, #8
@ -577,7 +579,7 @@ _022FD154:
bhi _022FD194
add r0, r5, #0xe
str r0, [sp]
add r0, r5, #0x124 + SPAWN_MONSTER_OFFSET
add r0, r5, #0x124 + SPAWN_MONSTER_OFFSET_2
add r1, r5, #0x12
add r2, r5, #0x1a
add r3, r5, #0x1c
@ -588,7 +590,7 @@ _022FD154:
b _022FD1F0
_022FD194:
ldrsh r2, [r5, #2]
add r0, r5, #0x124 + SPAWN_MONSTER_OFFSET
add r0, r5, #0x124 + SPAWN_MONSTER_OFFSET_2
add r1, r5, #0x12
str r2, [sp]
ldrb ip, [r5, #0xa]
@ -658,7 +660,7 @@ _022FD278:
strh r1, [r5, #0x10]
ldr r1, [r7, #4]
mov r0, r4
str r1, [r5, #0x120 + SPAWN_MONSTER_OFFSET]
str r1, [r5, #0x120 + SPAWN_MONSTER_OFFSET_2]
mov r1, #1
bl ov29_022FB83C
ldrb r0, [r7, #2]

4
asm/overlay_29_02300108.s
View File

@ -62,7 +62,7 @@ _02301574:
bl CopyStringFromId
ldmia sp!, {r4, pc}
_02300190:
ldr r0, [r1, #0xd8]
ldrb r0, [r1, #0xd8]
#else
stmdb sp!, {r3, r4, r5, lr}
mov r4, r1
@ -3369,7 +3369,7 @@ ItemIsActive__023026CC: ; 0x023026CC
arm_func_start EnemyEvolution
EnemyEvolution: ; 0x023026FC
#ifdef JAPAN
#define ENEMY_EVOLUTION_OFFSET -0xA4
#define ENEMY_EVOLUTION_OFFSET -4
#else
#define ENEMY_EVOLUTION_OFFSET 0
#endif

8
asm/overlay_29_02302A5C.s
View File

@ -1878,14 +1878,14 @@ _02304310:
ldr r2, [r1]
add r1, sp, #0x18
add r2, r2, #0x1a000
ldrb r3, [r2, #0x23c]
ldrb r3, [r2, #0x23c + OV29_02303F18_OFFSET_2]
add r2, sp, #0x28
bl ov29_022DDB98
add r0, sp, #0x10
mov r1, r7
bl ov29_022E3A40
cmp r4, #0
ldrneb r0, [r5, #0x156]
ldrneb r0, [r5, #0x156 + OV29_02303F18_OFFSET]
cmpne r0, #0
movne r0, #1
moveq r0, #0
@ -1906,7 +1906,7 @@ _02304310:
ldr r0, [r7, #0xb4]
ldr r1, _023046C8 ; =DUNGEON_PTR
ldr r3, _023046E0 ; =0x0000F3FF
ldrb r6, [r0, #0x220]
ldrb r6, [r0, #0x220 + OV29_02303F18_OFFSET]
mov r0, #0
ldr r1, [r1]
add r2, r3, #0xc00
@ -1916,7 +1916,7 @@ _02304310:
strh r0, [sp, #0x22]
strh r0, [sp, #0x24]
add r2, r1, #0x1a000
ldrb r2, [r2, #0x23c]
ldrb r2, [r2, #0x23c + OV29_02303F18_OFFSET_2]
mov r2, r2, lsl #0xa
strh r2, [sp, #0x26]
ldrb r2, [r5, #6]

2
asm/overlay_29_023047DC.s
View File

@ -817,7 +817,7 @@ _02305258:
cmp r0, #0
bne _02305304
add r2, sb, #0x200
ldrsh r0, [r2, #0xe]
ldrsh r0, [r2, #0xe + DISPLAY_ACTIONS_OFFSET]
add r0, r0, #1
strh r0, [r2, #0xe + DISPLAY_ACTIONS_OFFSET]
ldrsh r1, [r2, #0xe + DISPLAY_ACTIONS_OFFSET]

2
asm/overlay_29_023055B0.s
View File

@ -6,7 +6,7 @@
arm_func_start ov29_023055B0
ov29_023055B0: ; 0x023055B0
#ifdef JAPAN
#define OV29_023055B0_OFFSET 4
#define OV29_023055B0_OFFSET -4
#else
#define OV29_023055B0_OFFSET 0
#endif

8
asm/overlay_29_023082A0.s
View File

@ -913,9 +913,9 @@ _02308C0C:
ldrsh r1, [r1]
cmp r0, r1
addlt r0, r6, #0x100
ldrlth r1, [r0, #0x92]
ldrlth r1, [r0, #0x92 + APPLY_DAMAGE_AND_EFFECTS_OFFSET]
orrlt r1, r1, #1
strlth r1, [r0, #0x92]
strlth r1, [r0, #0x92 + APPLY_DAMAGE_AND_EFFECTS_OFFSET]
_02308C38:
mov r0, sl
mov r1, sb
@ -1164,7 +1164,11 @@ _02308F70: .word ATK_STAT_IDX
_02308F74: .word ov10_022C442C
_02308F78: .word ov10_022C44C0
_02308F7C: .word ov10_022C4464
#ifdef JAPAN
_02308F80: .word 0x0000097E
#else
_02308F80: .word 0x00000C3F
#endif
_02308F84: .word ov10_022C45B4
_02308F88: .word ov29_023535DC
_02308F8C: .word ov10_022C45B0

59
asm/overlay_29_02308FE0.s
View File

@ -442,7 +442,7 @@ _0230A034:
bl ov29_022E576C
b _0230A06C
_0230A044:
ldrb r0, [r7, #0x15c]
ldrb r0, [r7, #0x15c + APPLY_DAMAGE_OFFSET]
cmp r0, #0
bne _0230A060
ldr r2, _02309FC4 ; =0x00000C47
@ -1546,7 +1546,7 @@ _02309608:
bl ov29_022E576C
b _02309640
_02309618:
ldrb r0, [r4, #0x15c]
ldrb r0, [r4, #0x15c + APPLY_DAMAGE_OFFSET]
cmp r0, #0
bne _02309634
ldr r2, _02309FC4 ; =0x00000C47
@ -2259,7 +2259,7 @@ _0230A024:
ldr r0, [r0]
add r0, r0, r5, lsl #2
add r0, r0, #0x12000
ldr r6, [r0, #0xb28 + APPLY_DAMAGE_OFFSET_2]
ldr r6, [r0, #0xb28]
mov r0, r6
bl EntityIsValid__02308FBC
cmp r0, #0
@ -2324,14 +2324,14 @@ _0230AAB4:
strh r1, [r7, #0x10]
bl ov29_022E66D8
mov r2, #0
strb r2, [r7, #0x162 + APPLY_DAMAGE_OFFSET]
strb r2, [r7, #0x162]
mov r0, #1
strb r0, [r7, #0x156 + APPLY_DAMAGE_OFFSET]
strb r0, [r7, #0x156]
add r0, r7, #0x100
ldrh r1, [r0, #0x4a + APPLY_DAMAGE_OFFSET]
strh r1, [r0, #0x46 + APPLY_DAMAGE_OFFSET]
ldrh r1, [r0, #0x4c + APPLY_DAMAGE_OFFSET]
strh r1, [r0, #0x48 + APPLY_DAMAGE_OFFSET]
ldrh r1, [r0, #0x4a]
strh r1, [r0, #0x46]
ldrh r1, [r0, #0x4c]
strh r1, [r0, #0x48]
ldrb r0, [r7, #7]
cmp r0, #0
ldrne r0, _02309FFC ; =DUNGEON_PTR
@ -2878,7 +2878,7 @@ _0230B338:
ldr r0, [r6]
add r0, r0, sb, lsl #2
add r0, r0, #0x12000
ldr sl, [r0, #0xb28]
ldr sl, [r0, #0xb28 + APPLY_DAMAGE_OFFSET_2]
mov r0, sl
bl EntityIsValid__02308FBC
cmp r0, #0
@ -2943,14 +2943,14 @@ _0230A098:
strh r1, [r4, #0x10]
bl ov29_022E66D8
mov r2, #0
strb r2, [r4, #0x162]
strb r2, [r4, #0x162 + APPLY_DAMAGE_OFFSET]
mov r0, #1
strb r0, [r4, #0x156]
strb r0, [r4, #0x156 + APPLY_DAMAGE_OFFSET]
add r0, r4, #0x100
ldrh r1, [r0, #0x4a]
strh r1, [r0, #0x46]
ldrh r1, [r0, #0x4c]
strh r1, [r0, #0x48]
ldrh r1, [r0, #0x4a + APPLY_DAMAGE_OFFSET]
strh r1, [r0, #0x46 + APPLY_DAMAGE_OFFSET]
ldrh r1, [r0, #0x4c + APPLY_DAMAGE_OFFSET]
strh r1, [r0, #0x48 + APPLY_DAMAGE_OFFSET]
ldrb r0, [r4, #7]
cmp r0, #0
ldrne r0, _02309FFC ; =DUNGEON_PTR
@ -4615,7 +4615,7 @@ _0230B7A8: .word DAMAGE_MULTIPLIER_0_5
_0230B7AC: .word TECHNICIAN_MOVE_POWER_THRESHOLD
_0230B7B0: .word DAMAGE_MULTIPLIER_1_5
_0230B7B4: .word 0x00000C3E + CALC_TYPE_BASED_DAMAGE_EFFECTS_OFFSET
_0230B7B8: .word 0x000003E7 + CALC_TYPE_BASED_DAMAGE_EFFECTS_OFFSET
_0230B7B8: .word 0x000003E7
_0230B7BC: .word DAMAGE_MULTIPLIER_2
_0230B7C0: .word 0x00000C4F + CALC_TYPE_BASED_DAMAGE_EFFECTS_OFFSET
#ifdef JAPAN
@ -5744,7 +5744,11 @@ _0230C76C:
ldr r0, [sp, #0x14]
add r0, r1, r0
add r0, r0, #0x3000
ldrb r0, [r0, #0xe36 + CALC_DAMAGE_OFFSET]
#ifdef JAPAN
ldrb r0, [r0, #0xd92]
#else
ldrb r0, [r0, #0xe36]
#endif
cmp r0, #0
movne r0, #0xa
mulne r0, fp, r0
@ -5764,7 +5768,11 @@ _0230C7D4:
ldr r0, [sp, #0x14]
add r0, r1, r0
add r0, r0, #0x3000
ldrb r0, [r0, #0xe34 + CALC_DAMAGE_OFFSET]
#ifdef JAPAN
ldrb r0, [r0, #0xd90]
#else
ldrb r0, [r0, #0xe34]
#endif
cmp r0, #0
movne r0, #0xa
mulne r0, fp, r0
@ -7694,7 +7702,7 @@ _0230E218:
bl GetNameString
mov r1, r0
add r0, sp, #0x100
add r0, r0, #0xa
add r0, r0, #0xa + TRY_RECRUIT_OFFSET
mov r2, #0xa
bl StrncpyName
ldrsh r1, [sp, #0xb8 + TRY_RECRUIT_OFFSET]
@ -7704,11 +7712,14 @@ _0230E218:
add r1, sp, #0x100
add r0, sp, #0x98
add r1, r1, #0xa + TRY_RECRUIT_OFFSET
#ifndef JAPAN
#ifdef JAPAN
add r4, sp, #0x18
bl StrcpySimple
#else
mov r2, #0xa
#endif
add r4, sp, #0x18
bl StrncpySimpleNoPad
#endif
bl ov29_022EACAC
bl ov29_0234B034
mov r1, r0
@ -7906,7 +7917,11 @@ _0230E540:
_0230E550:
mov r0, r4
add sp, sp, #0x114 + TRY_RECRUIT_OFFSET
#ifdef JAPAN
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
#else
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
#endif
.align 2, 0
_0230E55C: .word 0x00000C77 + TRY_RECRUIT_OFFSET_2
_0230E560: .word DUNGEON_PTR

20
asm/overlay_29_0230F02C.s
View File

@ -550,7 +550,7 @@ _0230F718:
arm_func_start ov29_0230F728
ov29_0230F728: ; 0x0230F728
#ifdef JAPAN
#define OV29_0230F728_OFFSET -0xA4
#define OV29_0230F728_OFFSET -4
#else
#define OV29_0230F728_OFFSET 0
#endif
@ -956,7 +956,7 @@ _0230FBB8:
strhsb r0, [r4, #0x107 + TICK_NO_SLIP_CAP_OFFSET]
mov r0, #0x64
bl DungeonRandInt
ldrb r2, [r4, #0x107]
ldrb r2, [r4, #0x107 + TICK_NO_SLIP_CAP_OFFSET]
ldr r1, _0230FC20 ; =ov10_022C4BE4
mov r2, r2, lsl #1
ldrsh r1, [r1, r2]
@ -976,9 +976,11 @@ ov29_0230FC24: ; 0x0230FC24
#ifdef JAPAN
#define OV29_0230FC24_OFFSET -4
#define OV29_0230FC24_OFFSET_2 -0xA4
#define OV29_0230FC24_OFFSET_3 -1
#else
#define OV29_0230FC24_OFFSET 0
#define OV29_0230FC24_OFFSET_2 0
#define OV29_0230FC24_OFFSET_3 0
#endif
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
sub sp, sp, #0x34
@ -2176,21 +2178,13 @@ _02310DC4:
cmp r0, #0
bne _02310FF4
_02310DE0:
#ifdef JAPAN
ldrb r0, [r4, #0x105]
#else
ldrb r0, [r4, #0x106]
#endif
ldrb r0, [r4, #0x106 + OV29_0230FC24_OFFSET_3]
cmp r0, #0
beq _02310E9C
add r0, r4, #6
add r0, r4, #6 + OV29_0230FC24_OFFSET_3
add r0, r0, #0x100
bl TickStatusTurnCounter
#ifdef JAPAN
ldrb r0, [r4, #0x105]
#else
ldrb r0, [r4, #0x106]
#endif
ldrb r0, [r4, #0x106 + OV29_0230FC24_OFFSET_3]
cmp r0, #0
bne _02310E9C
mov r0, #0

13
asm/overlay_29_023118D8.s
View File

@ -1935,7 +1935,7 @@ _023131F0: .word 0x00000D2A
arm_func_start TryInflictWrappedStatus
TryInflictWrappedStatus: ; 0x023131F4
#ifdef JAPAN
#define TRY_INFLICT_WRAPPED_STATUS_OFFSET -0x2C0
#define TRY_INFLICT_WRAPPED_STATUS_OFFSET -0xA4
#else
#define TRY_INFLICT_WRAPPED_STATUS_OFFSET 0
#endif
@ -2067,11 +2067,16 @@ _023133D0:
bl UpdateStatusIconFlags
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
#ifdef JAPAN
#define TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET -0x2C0
#else
#define TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET 0
#endif
_023133DC: .word ov10_022C48AC
_023133E0: .word DUNGEON_PTR
_023133E4: .word 0x00000D2B + TRY_INFLICT_WRAPPED_STATUS_OFFSET
_023133E8: .word 0x00000D2C + TRY_INFLICT_WRAPPED_STATUS_OFFSET
_023133EC: .word 0x00000D2D + TRY_INFLICT_WRAPPED_STATUS_OFFSET
_023133E4: .word 0x00000D2B + TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET
_023133E8: .word 0x00000D2C + TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET
_023133EC: .word 0x00000D2D + TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET
arm_func_end TryInflictWrappedStatus
arm_func_start FreeOtherWrappedMonsters

8
asm/overlay_29_0231513C.s
View File

@ -1960,10 +1960,10 @@ TryDecreaseBelly: ; 0x023168D8
bl CeilFixedPoint
add r1, r4, #0x100
mov r4, r0
ldrh r0, [r1, #0x4a]
ldrh r0, [r1, #0x4a + TRY_DECREASE_BELLY_OFFSET]
sub r2, sp, #4
strh r0, [r2]
ldrh r0, [r1, #0x4c]
ldrh r0, [r1, #0x4c + TRY_DECREASE_BELLY_OFFSET]
strh r0, [r2, #2]
ldr r0, [r2]
bl CeilFixedPoint
@ -4058,7 +4058,11 @@ TryInflictLuckyChantStatus: ; 0x02318508
_02318584:
mov r0, r6
mov r1, r5
#ifdef JAPAN
mov r2, #0xac0
#else
mov r2, #0xd80
#endif
bl LogMessageByIdWithPopupCheckUserTarget
_02318594:
mov r0, r5

2
asm/overlay_29_02319FB0.s
View File

@ -973,7 +973,7 @@ _0231AC88:
ldmia sp!, {r4, r5, r6, r7, pc}
.align 2, 0
#ifdef JAPAN
#define OV29_0231A9F8_OFFSET -0xC20
#define OV29_0231A9F8_OFFSET -0x2C0
#else
#define OV29_0231A9F8_OFFSET 0
#endif

6
asm/overlay_29_0231B1B8.s
View File

@ -386,7 +386,11 @@ _0231B5F4:
beq _0231B678
mov r0, r8
bl ov29_022F04F0
#ifdef JAPAN
mov r0, #2
#else
mov r0, #1
#endif
bl AnimationDelayOrSomething
mov r0, r8
bl ov29_022F0518
@ -1581,7 +1585,7 @@ _0231C738: .word SITRUS_BERRY_HP_RESTORATION
_0231C73C: .word SITRUS_BERRY_FULL_HP_BOOST
_0231C740: .word LIFE_SEED_HP_BOOST
_0231C744: .word SLEEP_TURN_RANGE
_0231C748: .word 0x00000BE9
_0231C748: .word 0x00000BE9 + APPLY_ITEM_EFFECT_OFFSET
_0231C74C: .word 0x000003E7
_0231C750: .word PROTEIN_STAT_BOOST
_0231C754: .word CALCIUM_STAT_BOOST

12
asm/overlay_29_0231CBEC.s
View File

@ -144,9 +144,9 @@ _0231CD6C:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
#ifdef JAPAN
_0231CD74: .word 0x0000092B
_0231CD78: .word 0x0000092C
_0231CD7C: .word 0x0000092D
_0231CD74: .word 0x0000092A
_0231CD78: .word 0x0000092B
_0231CD7C: .word 0x0000092C
#else
_0231CD74: .word 0x00000BEB
_0231CD78: .word 0x00000BEC
@ -320,8 +320,8 @@ _0231CF64:
_0231CF78: .word GINSENG_CHANCE_3
#ifdef JAPAN
_0231E440: .word 0x0000092F
_0231CF7C: .word 0x0000092F
_0231CF80: .word 0x0000092E
_0231CF7C: .word 0x0000092E
_0231CF80: .word 0x0000092D
#else
_0231CF7C: .word 0x00000BEF
_0231CF80: .word 0x00000BEE
@ -681,7 +681,7 @@ _0231D460:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
#ifdef JAPAN
#define APPLY_GUMMI_BOOSTS_DUNGEON_MODE_OFFSET -0xA4
#define APPLY_GUMMI_BOOSTS_DUNGEON_MODE_OFFSET -0x2C1
#else
#define APPLY_GUMMI_BOOSTS_DUNGEON_MODE_OFFSET 0
#endif

1245
asm/overlay_31.s
View File

File diff suppressed because it is too large Load Diff