Skip to content

Commit 8b0ed73

Browse files
AnonymousRandomPersonAnonymousRandomPerson
authored
Merge pull request #242 from AnonymousRandomPerson/main
Synced from pmdsky-debug
2 parents f185338 + f078017 commit 8b0ed73

41 files changed

Lines changed: 1591 additions & 1596 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎asm/include/main_rodata_020A2808.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,11 +1679,11 @@
16791679
.public SoundLfoWave_InvalidFunc
16801680
.public SoundLfoWave_ReverseSawFunc
16811681
.public SoundLfoWave_SawFunc
1682-
.public ST_I2N_E_BIN
1683-
.public ST_I2N_F_BIN
1684-
.public ST_I2N_G_BIN
1685-
.public ST_I2N_I_BIN
1686-
.public ST_I2N_S_BIN
1682+
.public ST_I2N_E_BIN_FILE_NAME
1683+
.public ST_I2N_F_BIN_FILE_NAME
1684+
.public ST_I2N_G_BIN_FILE_NAME
1685+
.public ST_I2N_I_BIN_FILE_NAME
1686+
.public ST_I2N_S_BIN_FILE_NAME
16871687
.public STRING_BALANCE_M_LEVEL_BIN
16881688
.public STRING_DUNGEON_DUNGEON_BIN
16891689
.public STRING_EFFECT_EFFECT_BIN

‎asm/include/overlay_29_022F59C4.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
.public ov29_023009CC
4242
.public ov29_02304AFC
4343
.public ov29_0231AE3C
44-
.public ov29_0232145C
44+
.public UseMove
4545
.public ov29_02322374
4646
.public ov29_0233A248
4747
.public ov29_02344544

‎asm/include/overlay_29_022FB678.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#pragma once
2-
.public _020A1870
32
.public Conversion2IsActive
43
.public DIRECTIONS_XY
5-
.public DisplayAnimatedNumbers
64
.public DUNGEON_PTR
5+
.public DisplayAnimatedNumbers
76
.public EntityIsValid__022F7364
87
.public GetMaxPp
98
.public GetMoveBasePp
109
.public GetTile
1110
.public IqSkillIsEnabled
1211
.public IsMonster__022F9720
1312
.public IsSecretBazaarNpcBehavior
14-
.public ov29_022E576C
15-
.public ov29_02307CE0
16-
.public ov29_02348100
1713
.public TeamMemberHasEnabledIqSkill
1814
.public UpdateMapSurveyorFlag
1915
.public UpdateMinimap
16+
.public _020A1870
17+
.public ov29_022E576C
18+
.public ov29_02307CE0
19+
.public ov29_02348100

‎asm/include/overlay_29_022FBA70.inc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#pragma once
2+
.public IsMonster__022F9720

‎asm/include/overlay_29_022FBB1C.inc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#pragma once
22
.public DUNGEON_PTR
33
.public EntityIsValid__022F7364
4-
.public GetBodySize
54
.public GetIdleAnimationId
65
.public GetTileSafe
76
.public InitAnimationControlWithSet__0201C0CC
8-
.public IsMonster__022F9720
7+
.public SetSpriteIdForAnimationControl
98
.public ov29_022DDA54
109
.public ov29_02304830
11-
.public SetSpriteIdForAnimationControl

‎asm/include/overlay_29_022FBC4C.inc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#pragma once
2+
.public DUNGEON_PTR
3+
.public EntityIsValid__022F7364
4+
.public GetBodySize
5+
.public IsMonster__022F9720

‎asm/include/overlay_29_0231A8A0.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
.public IsMonster__0231A9D4
88
.public LogMessageByIdWithPopupCheckUser
99
.public ov29_022FA574
10-
.public ov29_0232145C
10+
.public UseMove
1111
.public ShouldUsePp
1212
.public TryActivateTruant
1313
.public UpdateMovePp

asm/include/overlay_29_0231AF24.inc renamed to asm/include/overlay_29_0231AFB4.inc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
.public DUNGEON_PTR
44
.public EntityIsValid__0231B194
55
.public GetTreasureBoxChances
6-
.public IsMonster__0231A9D4
76
.public LogMessageByIdWithPopupCheckParticipants
87
.public LogMessageByIdWithPopupCheckUserTarget
9-
.public ov29_022E4110
10-
.public ov29_022FB9E0
11-
.public ov29_0232145C
12-
.public ov29_0232E80C
138
.public PrepareItemForPrinting__02345728
14-
.public SetActionUseMoveAi
159
.public SubstitutePlaceholderStringTags
10+
.public ov29_022E4110
11+
.public ov29_0232E80C

‎asm/include/overlay_29_0231CBEC.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
.public ov29_022F8830
7878
.public ov29_022F9C34
7979
.public ov29_022FA02C
80-
.public ov29_022FBA54
80+
.public DoesMonsterHaveMove
8181
.public ov29_023009A0
8282
.public ov29_023021F0
8383
.public ov29_02339FF4

‎asm/include/overlay_29_02346834.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
.public ov29_022EBB98
4949
.public ov29_022FAFD4
5050
.public ov29_022FB920
51-
.public ov29_022FBA54
51+
.public DoesMonsterHaveMove
5252
.public ov29_023009A0
5353
.public ov29_023457C8
5454
.public ov29_0234B4CC

0 commit comments

Comments
 (0)