Skip to content

Commit 2431b88

Browse files
AnonymousRandomPersonAnonymousRandomPerson
committed
Synced from pmdsky-debug
1 parent 787c260 commit 2431b88

52 files changed

Lines changed: 588 additions & 584 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_0202598C.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
.public GetWindow
3333
.public GetWindowRectangle
3434
.public HandleSir0Translation
35+
.public IsTouchScreenNotOff
3536
.public LoadFileFromRom
3637
.public PreprocessStringFromId
3738
.public RandInt
@@ -67,7 +68,6 @@
6768
.public sub_02028324
6869
.public sub_020288DC
6970
.public sub_020288FC
70-
.public IsTouchScreenNotOff
7171
.public TBL_TALK_GROUP_STRING_ID_START
7272
.public UnloadFile
7373
.public UpdateWindow

‎asm/include/main_0202676C.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
.public InitPortraitParams
118118
.public InitPreprocessorArgs
119119
.public InitRender3dElement64
120+
.public IsTouchScreenNotOff
120121
.public IsValidPortrait
121122
.public KeyWaitInit
122123
.public LoadFileFromRom
@@ -195,7 +196,6 @@
195196
.public sub_0203C984
196197
.public sub_020469BC
197198
.public sub_02048240
198-
.public IsTouchScreenNotOff
199199
.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS
200200
.public TEXT_BOX_DEFAULT_WINDOW_PARAMS
201201
.public UnloadFile

‎asm/include/main_02034974.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
.public CloseSimpleMenu
9191
.public CloseTeamSelectionMenu
9292
.public CloseTextBox
93+
.public CopyFrameTypeOption
9394
.public CreateAdvancedMenu
9495
.public CreateAdvancedTextBox
9596
.public CreateDebugMenu
@@ -123,6 +124,7 @@
123124
.public GetMainCharacter2MemberIdx
124125
.public GetMainCharacter3MemberIdx
125126
.public GetNameString
127+
.public GetOptions
126128
.public GetOptionsMenuResult
127129
.public GetOptionsMenuStates
128130
.public GetPartner
@@ -167,8 +169,10 @@
167169
.public SaveScriptVariableValueBytes
168170
.public SetAdvancedTextBoxField0x1C2
169171
.public SetAdvancedTextBoxState5
172+
.public SetFrameTypeOption
170173
.public SetMainTeamName
171174
.public SetNotifyNote
175+
.public SetOptions
172176
.public SetSimpleMenuField0x1AC
173177
.public ShowDialogueBox
174178
.public ShowPortraitInPortraitBox
@@ -225,10 +229,6 @@
225229
.public sub_0203C9A0
226230
.public sub_02048078
227231
.public sub_0204964C
228-
.public GetOptions
229-
.public SetOptions
230-
.public CopyFrameTypeOption
231-
.public SetFrameTypeOption
232232
.public sub_0204DA1C
233233
.public sub_0204E210
234234
.public sub_0204E3C8

‎asm/include/main_0203C774.inc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
.public _022AAEA8
148148
.public _022AAEAC
149149
.public _022AB09C
150-
.public OPTIONS
151150
.public _022AB0A1
152151
.public _022AB0A2
153152
.public _022AB0A9
@@ -179,6 +178,7 @@
179178
.public ConvertStorageItemAtIdxToItem
180179
.public CopyBitsFrom
181180
.public CopyBitsTo
181+
.public CopyFrameTypeOption
182182
.public CopyMenuControlWindowExtraInfo
183183
.public CopyNStringFromId
184184
.public CopyProgressInfoFromScratchFrom
@@ -202,6 +202,7 @@
202202
.public CreateTextBoxWithArg
203203
.public Debug_GetDebugFlag
204204
.public Debug_Print0
205+
.public DebugPrintEventFlagSize
205206
.public DEFAULT_HERO_ID
206207
.public DisableIqSkill
207208
.public DrawTextInWindow
@@ -249,12 +250,12 @@
249250
.public GetNextIqSkill
250251
.public GetPartner
251252
.public GetPartnerMemberIdx
252-
.public GetResolvedPerformanceProgressFlag
253253
.public GetPpIncrease
254254
.public GetPressedButtons
255255
.public GetRank
256256
.public GetRankUpEntry
257257
.public GetReleasedStylus
258+
.public GetResolvedPerformanceProgressFlag
258259
.public GetRngSeed
259260
.public GetSimpleMenuResult__0202AEA4
260261
.public GetSimpleMenuResult__0202B870
@@ -271,6 +272,7 @@
271272
.public InitMenu
272273
.public InitMenuWithWindowExtraInfo
273274
.public InitMove
275+
.public InitOptions
274276
.public InitPortraitParams
275277
.public InitPortraitParamsWithMonsterId
276278
.public InitPreprocessorArgs
@@ -309,6 +311,7 @@
309311
.public MemsetSimple
310312
.public MemZero
311313
.public NOTIFY_NOTE
314+
.public OPTIONS
312315
.public OS_GetLockID
313316
.public ov11_023061CC
314317
.public ov11_023061E4
@@ -356,6 +359,7 @@
356359
.public SetPortraitLayout
357360
.public SetPortraitOffset
358361
.public SetRngSeed
362+
.public SetSpecialEpisodeOpenOld
359363
.public SetTeamSetupHeroAndPartnerOnly
360364
.public SetUnkAdvancedTextBoxFn
361365
.public SetUnkAdvancedTextBoxWindowFn
@@ -464,10 +468,6 @@
464468
.public sub_0203909C
465469
.public sub_02039218
466470
.public sub_0203931C
467-
.public DebugPrintEventFlagSize
468-
.public SetSpecialEpisodeOpenOld
469-
.public CopyFrameTypeOption
470-
.public InitOptions
471471
.public sub_0204CDB8
472472
.public sub_0204E154
473473
.public sub_0204E19C

‎asm/include/main_0204CDB8.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#pragma once
2-
.public SCENARIO_FLAG_RESUME_DEBUG_MSG
3-
.public SCENARIO_FLAG_BACKUP_DEBUG_MSG
42
.public _0209E008
53
.public _0209E010
64
.public _0209E011
@@ -28,6 +26,8 @@
2826
.public PORTRAIT_LAYOUTS
2927
.public SaveScriptVariableValue
3028
.public SaveScriptVariableValueAtIndex
29+
.public SCENARIO_FLAG_BACKUP_DEBUG_MSG
30+
.public SCENARIO_FLAG_RESUME_DEBUG_MSG
3131
.public SetAdventureLogCompleted
3232
.public sub_02050974
3333
.public sub_02050990

‎asm/include/main_0204DE7C.inc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#pragma once
2-
.public ARM9_UNKNOWN_TABLE__NA_209E280
2+
.public _0209E264
3+
.public _022AB4F8
4+
.public _022AB510
5+
.public _022AB518
6+
.public _022AB5A8
7+
.public _022AB5AC
8+
.public _s32_div_f
39
.public ApplyLevelUpBoostsToGroundMonster
10+
.public ARM9_UNKNOWN_TABLE__NA_209E280
411
.public CLIENT_LEVEL_TABLE
512
.public CopyLogFrom
613
.public CopyLogTo
@@ -18,15 +25,6 @@
1825
.public SaveOptionsToCtx
1926
.public SaveScriptVariableValue
2027
.public StringFromId
21-
.public WONDER_MAIL_BITS_SWAP
22-
.public WONDER_MAIL_ENCRYPTION_TABLE
23-
.public _0209E264
24-
.public _022AB4F8
25-
.public _022AB510
26-
.public _022AB518
27-
.public _022AB5A8
28-
.public _022AB5AC
29-
.public _s32_div_f
3028
.public sub_02004F80
3129
.public sub_0200C4CC
3230
.public sub_02048BFC
@@ -44,3 +42,5 @@
4442
.public sub_0205BD14
4543
.public sub_0205F00C
4644
.public sub_0205FE80
45+
.public WONDER_MAIL_BITS_SWAP
46+
.public WONDER_MAIL_ENCRYPTION_TABLE

‎asm/include/main_0204EFE0.inc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
#pragma once
2+
.public _0209E3A1
3+
.public _0209E3A2
4+
.public _0209E3A3
5+
.public _0209E6BD
6+
.public _020A192C
7+
.public _022AB4F8
8+
.public _022AB5AC
9+
.public _022AB69C
10+
.public _022AB924
211
.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS
312
.public ADVENTURE_LOG_PTR
413
.public ARM9_UNKNOWN_DATA__NA_209E6BC
@@ -30,8 +39,8 @@
3039
.public IsRealMove
3140
.public IsRecruitingAllowed
3241
.public LoadScriptVariableValue
33-
.public MISSION_FLOOR_RANKS_PTRS
3442
.public MemZero
43+
.public MISSION_FLOOR_RANKS_PTRS
3544
.public NormalizeTreasureBox
3645
.public OUTLAW_LEVEL_TABLE
3746
.public OUTLAW_MINION_LEVEL_TABLE
@@ -42,17 +51,8 @@
4251
.public StrncpyName
4352
.public StrncpySimpleNoPad
4453
.public StrncpySimpleNoPadSafe
45-
.public TEAM_MEMBER_TABLE_PTR
46-
.public TEAM_NAME
47-
.public _0209E3A1
48-
.public _0209E3A2
49-
.public _0209E3A3
50-
.public _0209E6BD
51-
.public _020A192C
52-
.public _022AB4F8
53-
.public _022AB5AC
54-
.public _022AB69C
55-
.public _022AB924
5654
.public sub_0204CEE0
5755
.public sub_020515C4
5856
.public sub_0205EE40
57+
.public TEAM_MEMBER_TABLE_PTR
58+
.public TEAM_NAME

‎asm/include/main_02052A7C.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
2-
.public MONSTER_DATA_TABLE_PTR
32
.public _s32_div_f
3+
.public MONSTER_DATA_TABLE_PTR

‎asm/include/main_02052B44.inc‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,30 @@
11
#pragma once
2+
.public _020A1880
3+
.public _020A1884
4+
.public _020A189C
5+
.public _020A18C0
6+
.public _020A3210
7+
.public _020A322C
8+
.public _020A3248
9+
.public _020A3258
10+
.public _020A327C
11+
.public _020A328C
12+
.public _020A32D4
13+
.public _020A32F8
14+
.public _020A3330
15+
.public _020B09C8
16+
.public _020B09D0
17+
.public _020B12F4_EU
18+
.public _020B1308_EU
19+
.public _s32_div_f
220
.public Debug_Print0
321
.public DecompressAtNormalVeneer
422
.public DexNumbersEqual
523
.public DirectoryFileMngr_OpenDirectoryFile
624
.public DungeonToGroundMoveset
725
.public EnableAllLearnableIqSkills
8-
.public FORBIDDEN_FORGOT_MOVE_LIST
926
.public FemaleToMaleForm
27+
.public FORBIDDEN_FORGOT_MOVE_LIST
1028
.public GetBaseDefensiveStat
1129
.public GetBaseHp
1230
.public GetBaseOffensiveStat
@@ -27,18 +45,18 @@
2745
.public GetNbMoves
2846
.public GetSpriteSize
2947
.public GroundToDungeonMoveset
30-
.public HIDDEN_POWER_BASE_POWER_TABLE
3148
.public HandleSir0Translation
49+
.public HIDDEN_POWER_BASE_POWER_TABLE
3250
.public IsShaymin
3351
.public IsValidTeamMember
3452
.public ItemZInit
3553
.public LEVEL_UP_DATA_DECOMPRESS_BUFFER
3654
.public LEVEL_UP_DATA_MONSTER_ID
3755
.public LoadFileFromRom
3856
.public LoadMonsterMd
39-
.public MONSTER_DATA_TABLE_PTR
4057
.public MemAlloc
4158
.public MemFree
59+
.public MONSTER_DATA_TABLE_PTR
4260
.public PointsToZero
4361
.public Rand16Bit
4462
.public RandIntSafe
@@ -50,28 +68,6 @@
5068
.public StrncmpSimple
5169
.public StrncpyName
5270
.public StrncpySimple
53-
.public TEAM_MEMBER_TABLE
54-
.public TEAM_MEMBER_TABLE_PTR
55-
.public UnloadFile
56-
.public ZInit8
57-
.public _020A1880
58-
.public _020A1884
59-
.public _020A189C
60-
.public _020A18C0
61-
.public _020A3210
62-
.public _020A322C
63-
.public _020A3248
64-
.public _020A3258
65-
.public _020A327C
66-
.public _020A328C
67-
.public _020A32D4
68-
.public _020A32F8
69-
.public _020A3330
70-
.public _020B09C8
71-
.public _020B09D0
72-
.public _020B12F4_EU
73-
.public _020B1308_EU
74-
.public _s32_div_f
7571
.public sub_01FF8F28
7672
.public sub_02015090
7773
.public sub_02025304_JP
@@ -85,4 +81,8 @@
8581
.public sub_020560B8
8682
.public sub_020564B0
8783
.public sub_02056504
84+
.public TEAM_MEMBER_TABLE
85+
.public TEAM_MEMBER_TABLE_PTR
86+
.public UnloadFile
8887
.public vsprintf
88+
.public ZInit8

0 commit comments

Comments
 (0)