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

Renamed veneer functions

Browse Source
This commit is contained in:
AnonymousRandomPerson 2023-09-05 23:39:35 -04:00
parent 698fbcad14
commit 52fcef93f1
19 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_022DC240.inc
View File

@ -188,7 +188,7 @@
.public LoadScriptVariableValue
.public ov29_02338A4C
.public ov29_023362EC
.public IsSecretBazaar__02344538
.public IsSecretBazaarVeneer
.public sub_0200A2F4
.public EnemyEvolution
.public ov29_022E0F6C

2
asm/include/overlay_29_022F05B4.inc
View File

@ -5,7 +5,7 @@
.public AddMoneyCarried
.public AdvanceFrame
.public CeilFixedPoint
.public CheckTeamMemberIdx__022F9C34
.public CheckTeamMemberIdxVeneer
.public __divsi3
.public DungeonRandInt
.public EntityIsValid__022F0590

2
asm/include/overlay_29_022F52B0.inc
View File

@ -23,7 +23,7 @@
.public InitMove
.public IqSkillIsEnabled
.public IsFloorOver
.public IsMonsterIdInNormalRange__022F9C68
.public IsMonsterIdInNormalRangeVeneer
.public ItemZInit
.public LogMessageByIdWithPopupCheckUser
.public RemoveEquivItemNoHole

2
asm/include/overlay_29_02308FE0.inc
View File

@ -57,7 +57,7 @@
.public IsCurrentMissionTypeExact
.public IsExperienceLocked
.public IsLegendaryChallengeFloor
.public IsMonsterIdInNormalRange__022F9C68
.public IsMonsterIdInNormalRangeVeneer
.public IsMonsterOnTeam
.public IsPunchMove
.public IsRecoilMove

2
asm/include/overlay_29_0231CBEC.inc
View File

@ -5,7 +5,7 @@
.public CalcDamageFixedNoCategory
.public CanSeeInvisibleMonsters
.public CeilFixedPoint
.public CheckTeamMemberIdx__022F9C34
.public CheckTeamMemberIdxVeneer
.public ClearMonsterActionFields
.public DisplayMessage2
.public DungeonRandInt

2
asm/include/overlay_29_0234EC38.inc
View File

@ -2,7 +2,7 @@
.public AdvanceFrame
.public Arm9LoadUnkFieldNa0x2029EC8
.public Arm9StoreUnkFieldNa0x2029ED8
.public CheckTeamMemberIdx__022F9C34
.public CheckTeamMemberIdxVeneer
.public DisplayMessage
.public DungeonGoesUp
.public DungeonRequestsDoneWrapper

2
asm/include/overlay_31.inc
View File

@ -6,7 +6,7 @@
.public AllManip1
.public IsBlinded
.public sub_020585B4
.public CheckTeamMemberIdx__022F9C34
.public CheckTeamMemberIdxVeneer
.public DisableDungeonSubMenuOption
.public sub_020348E4
.public sub_0203083C

36
asm/main_0200C4CC.s
View File

@ -11783,13 +11783,13 @@ _0201590C:
_0201592C:
ldr r0, [sp, #0x44]
ldr r1, _02015D0C ; =0x02098FC0
bl StrcmpTag__020235F8
bl StrcmpTagVeneer
cmp r0, #0
beq _02015CD8
ldr r0, [sp, #0x48]
bl StoiTag__02023604
bl StoiTagVeneer
ldr r0, [sp, #0x4c]
bl StoiTag__02023604
bl StoiTagVeneer
ldr r1, _02015D10 ; =0x020AF710
add ip, r5, #2
ldr r1, [r1]
@ -12453,13 +12453,13 @@ _02016210:
_0201622C:
ldr r0, [sp]
ldr r1, _02016288 ; =0x02098FC0
bl StrcmpTag__020235F8
bl StrcmpTagVeneer
cmp r0, #0
beq _02016270
ldr r0, [sp, #4]
bl StoiTag__02023604
bl StoiTagVeneer
ldr r0, [sp, #8]
bl StoiTag__02023604
bl StoiTagVeneer
mov r0, r0, lsl #0x10
add r5, r5, r0, asr #16
b _02016270
@ -28425,21 +28425,21 @@ PreprocessStringFromMessageId: ; 0x020235B8
ldmia sp!, {r3, r4, r5, r6, pc}
arm_func_end PreprocessStringFromMessageId
arm_func_start StrcmpTag__020235F8
StrcmpTag__020235F8: ; 0x020235F8
arm_func_start StrcmpTagVeneer
StrcmpTagVeneer: ; 0x020235F8
ldr ip, _02023600 ; =StrcmpTag
bx ip
.align 2, 0
_02023600: .word StrcmpTag
arm_func_end StrcmpTag__020235F8
arm_func_end StrcmpTagVeneer
arm_func_start StoiTag__02023604
StoiTag__02023604: ; 0x02023604
arm_func_start StoiTagVeneer
StoiTagVeneer: ; 0x02023604
ldr ip, _0202360C ; =StoiTag
bx ip
.align 2, 0
_0202360C: .word StoiTag
arm_func_end StoiTag__02023604
arm_func_end StoiTagVeneer
arm_func_start sub_02023610
sub_02023610: ; 0x02023610
@ -73292,13 +73292,13 @@ sub_0204872C: ; 0x0204872C
ldmia sp!, {r3, pc}
arm_func_end sub_0204872C
arm_func_start EventFlagBackup__02048758
EventFlagBackup__02048758: ; 0x02048758
arm_func_start EventFlagBackupVeneer
EventFlagBackupVeneer: ; 0x02048758
ldr ip, _02048760 ; =EventFlagBackup
bx ip
.align 2, 0
_02048760: .word EventFlagBackup
arm_func_end EventFlagBackup__02048758
arm_func_end EventFlagBackupVeneer
arm_func_start sub_02048764
sub_02048764: ; 0x02048764
@ -73977,7 +73977,7 @@ NoteSaveBase: ; 0x02048F84
bl SetNotifyNote
bl GetTime
mov r7, r0
bl EventFlagBackup__02048758
bl EventFlagBackupVeneer
cmp sb, #3
bne _02048FE0
bl sub_02048BFC
@ -163243,7 +163243,7 @@ _020908D0: .word 0x020AEEF0
.byte 0x20, 0x20, 0x50, 0x72, 0x69, 0x6E, 0x74, 0x20, 0x20, 0x00, 0x00, 0x00, 0x21, 0x21, 0x21, 0x21
.byte 0x21, 0x20, 0x46, 0x61, 0x74, 0x61, 0x6C, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x0A, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x28, 0x4E, 0x55, 0x4C, 0x4C, 0x29, 0x0A, 0x00, 0x25, 0x73, 0x0A, 0x00
.global STRING_EFFECT_EFFECT_BIN ; 0x02094b64
STRING_EFFECT_EFFECT_BIN:
.string "EFFECT/effect.bin"
@ -163263,7 +163263,7 @@ _020908D0: .word 0x020AEEF0
STRING_DUNGEON_DUNGEON_BIN:
.string "DUNGEON/dungeon.bin"
.align 4
.global STRING_MONSTER_M_ATTACK_BIN ; 0x02094bb4
STRING_MONSTER_M_ATTACK_BIN:
.string "MONSTER/m_attack.bin"

10
asm/overlay_01.s
View File

@ -924,8 +924,8 @@ ov01_0232A048: ; 0x0232A048
_0232A074: .word ov01_0233C240
arm_func_end ov01_0232A048
arm_func_start DoMoveNightShade
DoMoveNightShade: ; 0x0232A078
arm_func_start sub_0232A078
sub_0232A078: ; 0x0232A078
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl EnableIrqFlag
@ -1006,7 +1006,7 @@ _0232A180:
.align 2, 0
_0232A18C: .word ov01_0233C240
_0232A190: .word ov01_0233C0C0
arm_func_end DoMoveNightShade
arm_func_end sub_0232A078
arm_func_start ov01_0232A194
ov01_0232A194: ; 0x0232A194
@ -1807,7 +1807,7 @@ _0232ABBC:
cmpne r1, #2
movne r1, #3
strne r1, [r0, #0x7c]
ldr r0, _0232ABFC ; =DoMoveNightShade
ldr r0, _0232ABFC ; =sub_0232A078
bl ov00_022BFB9C
cmp r0, #2
ldrne r0, _0232ABF8 ; =ov01_0233C240
@ -1818,7 +1818,7 @@ _0232ABBC:
ldmia sp!, {r3, pc}
.align 2, 0
_0232ABF8: .word ov01_0233C240
_0232ABFC: .word DoMoveNightShade
_0232ABFC: .word sub_0232A078
arm_func_end ov01_0232AB88
arm_func_start ov01_0232AC00

8
asm/overlay_11.s
View File

@ -9675,13 +9675,13 @@ _022E46D0:
ldmia sp!, {r4, r5, r6, pc}
arm_func_end ov11_022E469C
arm_func_start LoadFileFromRom__022E46DC
LoadFileFromRom__022E46DC: ; 0x022E46DC
arm_func_start LoadFileFromRomVeneer
LoadFileFromRomVeneer: ; 0x022E46DC
ldr ip, _022E46E4 ; =LoadFileFromRom
bx ip
.align 2, 0
_022E46E4: .word LoadFileFromRom
arm_func_end LoadFileFromRom__022E46DC
arm_func_end LoadFileFromRomVeneer
arm_func_start ov11_022E46E8
ov11_022E46E8: ; 0x022E46E8
@ -41966,7 +41966,7 @@ _022FF760:
ldr r0, [r0, #4]
mov r2, #8
add r0, r0, #8
bl LoadFileFromRom__022E46DC
bl LoadFileFromRomVeneer
ldr r0, _022FF9E0 ; =0x02324D14
ldr r2, [r0, #4]
ldr r1, [r2, #8]

2
asm/overlay_29_022DC240.s
View File

@ -3881,7 +3881,7 @@ _022DF5E4:
movne r1, #1
strneb r1, [r0, #0x23f]
strneb r1, [r0, #0x240]
bl IsSecretBazaar__02344538
bl IsSecretBazaarVeneer
ldr r0, _022DFF40 ; =0x02353538
ldr r0, [r0]
add r0, r0, #0x4000

2
asm/overlay_29_022F05B4.s
View File

@ -3701,7 +3701,7 @@ _022F39D8:
tst r0, #0xff
beq _022F3A40
ldrsh r0, [r7, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
cmp r0, #0
ldrsh r0, [sb, #0xc]
ldreqsh r8, [r7, #8]

2
asm/overlay_29_022F52B0.s
View File

@ -862,7 +862,7 @@ _022F5E1C:
addne r6, r5, #3
bne _022F5E84
ldrsh r0, [r4, #8]
bl IsMonsterIdInNormalRange__022F9C68
bl IsMonsterIdInNormalRangeVeneer
cmp r0, #0
beq _022F5E84
bl IsMarowakTrainingMaze

12
asm/overlay_29_022F7388.s
View File

@ -2954,13 +2954,13 @@ _022F9C00:
ldmia sp!, {r3, r4, pc}
arm_func_end ov29_022F9B8C
arm_func_start CheckTeamMemberIdx__022F9C34
CheckTeamMemberIdx__022F9C34: ; 0x022F9C34
arm_func_start CheckTeamMemberIdxVeneer
CheckTeamMemberIdxVeneer: ; 0x022F9C34
ldr ip, _022F9C3C ; =CheckTeamMemberIdx
bx ip
.align 2, 0
_022F9C3C: .word CheckTeamMemberIdx
arm_func_end CheckTeamMemberIdx__022F9C34
arm_func_end CheckTeamMemberIdxVeneer
arm_func_start ov29_022F9C40
ov29_022F9C40: ; 0x022F9C40
@ -2981,13 +2981,13 @@ ov29_022F9C4C: ; 0x022F9C4C
ldmia sp!, {r3, pc}
arm_func_end ov29_022F9C4C
arm_func_start IsMonsterIdInNormalRange__022F9C68
IsMonsterIdInNormalRange__022F9C68: ; 0x022F9C68
arm_func_start IsMonsterIdInNormalRangeVeneer
IsMonsterIdInNormalRangeVeneer: ; 0x022F9C68
ldr ip, _022F9C70 ; =IsMonsterIdInNormalRange
bx ip
.align 2, 0
_022F9C70: .word IsMonsterIdInNormalRange
arm_func_end IsMonsterIdInNormalRange__022F9C68
arm_func_end IsMonsterIdInNormalRangeVeneer
arm_func_start ov29_022F9C74
ov29_022F9C74: ; 0x022F9C74

2
asm/overlay_29_02308FE0.s
View File

@ -943,7 +943,7 @@ _02309D3C:
b _02309DC8
_02309D60:
ldrsh r0, [r6, #8]
bl IsMonsterIdInNormalRange__022F9C68
bl IsMonsterIdInNormalRangeVeneer
cmp r0, #0
beq _02309DB4
ldr r0, _02309FFC ; =0x02353538

2
asm/overlay_29_0231CBEC.s
View File

@ -1232,7 +1232,7 @@ _0231DC60:
bge _0231DCAC
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
cmp r0, #0
movne r6, #0
_0231DCAC:

6
asm/overlay_29_02337CCC.s
View File

@ -14698,13 +14698,13 @@ _02344530:
ldmia sp!, {r3, pc}
arm_func_end IsHiddenStairsFloor
arm_func_start IsSecretBazaar__02344538
IsSecretBazaar__02344538: ; 0x02344538
arm_func_start IsSecretBazaarVeneer
IsSecretBazaarVeneer: ; 0x02344538
ldr ip, _02344540 ; =IsSecretBazaar
bx ip
.align 2, 0
_02344540: .word IsSecretBazaar
arm_func_end IsSecretBazaar__02344538
arm_func_end IsSecretBazaarVeneer
arm_func_start ov29_02344544
ov29_02344544: ; 0x02344544

2
asm/overlay_29_0234EC38.s
View File

@ -58,7 +58,7 @@ _0234ECE4:
add sl, sb, r5, lsl #5
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
strb r0, [sl, #4]
str r7, [sl, #0x1c]
str r6, [sb, r5, lsl #5]

6
asm/overlay_31.s
View File

@ -5368,7 +5368,7 @@ _02387278:
bge _023872FC
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
cmp r0, #0
movne r6, #0
_023872FC:
@ -5862,7 +5862,7 @@ _02387958:
ldrsh r0, [r6, #0xc]
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
cmp r0, #0
ldrsh r1, [r6, #0x12]
ldrsh r0, [r6, #0x16]
@ -6472,7 +6472,7 @@ _0238826C:
ldrsh r0, [r6, #0xc]
bl GetActiveTeamMember
ldrsh r0, [r0, #8]
bl CheckTeamMemberIdx__022F9C34
bl CheckTeamMemberIdxVeneer
str r0, [sp, #4]
b _023882E8
_023882A0: