Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More battle controller player decomp #203

Merged
merged 23 commits into from
Aug 10, 2023
Merged

More battle controller player decomp #203

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
322d3a7
Update Mon Condition
adrienntindall Jul 22, 2023
f384de5
More controller functions
adrienntindall Jul 27, 2023
e862c86
Merge branch 'master' into master
adrienntindall Jul 27, 2023
d0dc751
Document battle item stuff
adrienntindall Jul 27, 2023
cf4179b
Document input commands
adrienntindall Jul 27, 2023
f9e1e8d
documentation work
adrienntindall Jul 28, 2023
eae74e7
Fix BattleSystem_GetBattleType return value
adrienntindall Jul 28, 2023
1f3256d
More battle system return functions
adrienntindall Jul 29, 2023
442d04a
More lo hanging fruit
adrienntindall Jul 29, 2023
ed04b83
Next function is long
adrienntindall Jul 30, 2023
063a81b
Recover status function
adrienntindall Jul 31, 2023
15a10f7
Minor BattleSystem struct documentation
adrienntindall Jul 31, 2023
d1f08f3
More Battle System Function Documentation
adrienntindall Aug 1, 2023
f137021
More documentation before going to bed
adrienntindall Aug 1, 2023
09b1564
Background handling function
adrienntindall Aug 5, 2023
bad15b4
Merge branch 'master' into master
adrienntindall Aug 5, 2023
0e30fb7
Add consts
adrienntindall Aug 5, 2023
868337b
red lied to me about a const existing smh
adrienntindall Aug 5, 2023
f03a634
red was feeding me misinformation smh
adrienntindall Aug 6, 2023
b0e786c
eventually red will learn that if she doesn't review my PRs she'll ju…
adrienntindall Aug 6, 2023
1cab87a
Fix BattleHpBar struct
adrienntindall Aug 8, 2023
b918a98
Up to Battle Random functions
adrienntindall Aug 10, 2023
e6bad96
Merge branch 'master' into master
red031000 Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions asm/include/overlay_08.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,22 @@
.public _u32_div_f
.public gSystem
.public ov08_022225D4
.public ov12_0223A7D4
.public BattleSystem_GetBgConfig
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetBattleContext
.public BattleSystem_GetParty
.public BattleSystem_GetPartyMon
.public ov12_0223A8E4
.public ov12_0223A938
.public ov12_0223A9F4
.public ov12_0223AA80
.public ov12_0223AA84
.public BattleSystem_GetTrainer
.public BattleSystem_GetBag
.public BattleSystem_GetBagCursor
.public ov12_0223AB0C
.public ov12_0223AB3C
.public BattleSystem_GetPcStorage
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_RecoverStatus
.public ov12_0223B708
.public ov12_0223B718
.public BattleSystem_GetFrame
.public BattleSystem_GetTextFrameDelay
.public ov12_022581D4
.public BattleCursor_LoadResources
.public BattleCursor_FreeResources
Expand Down
14 changes: 7 additions & 7 deletions asm/include/overlay_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,23 +198,23 @@
.public ov12_02237ED0
.public ov12_022399BC
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetBattleContext
.public BattleSystem_GetOpponentData
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetPartySize
.public BattleSystem_GetPartyMon
.public BattleSystem_GetPlayerProfile
.public ov12_0223AA84
.public BattleSystem_GetBagCursor
.public BattleSystem_GetMonBall
.public ov12_0223AAC8
.public BattleSystem_GetTrainerGender
.public BattleSystem_GetFieldSide
.public BattleSystem_GetTerrainId
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleSpecial
.public ov12_0223B52C
.public ov12_0223B5EC
.public ov12_0223B708
.public ov12_0223B798
.public BattleSystem_CheckEvolution
.public BattleSystem_GetFrame
.public BattleSystem_TryChangeForm
.public ov12_0223B870
.public ov12_0223BBF0
.public ov12_0223BC48
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_12_02264824.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
.public _ll_mul
.public _s32_div_f
.public _u32_div_f
.public ov12_0223A7D4
.public BattleSystem_GetBgConfig
.public BattleSystem_GetBattleType
.public BattleSystem_GetPartyMon
.public ov12_0223A8E4
.public ov12_0223A8EC
.public ov12_0223A920
.public ov12_0223A928
.public BattleSystem_GetHpFont
.public BattleSystem_GetLevelFont
.public ov12_0223A930
.public ov12_0223A938
.public ov12_0223A9A4
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_12_02266024.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
.public _s32_div_f
.public gSystem
.public ov06_0221BA1C
.public ov12_0223A7D4
.public BattleSystem_GetBgConfig
.public BattleSystem_GetBattleType
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetOpponentData
.public BattleSystem_GetPartyMon
.public ov12_0223A8E4
.public ov12_0223A8EC
Expand All @@ -140,7 +140,7 @@
.public ov12_0223A9A4
.public ov12_0223AAD8
.public ov12_0223AB54
.public ov12_0223B6B4
.public BattleSystem_GetSafariBallCount
.public ov12_0223BB04
.public ov12_0223BB64
.public ov12_0223C134
Expand Down
22 changes: 11 additions & 11 deletions asm/include/overlay_12_battle_command.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@
.public ov12_02237B6C
.public ov12_02237CC4
.public ov12_02237D00
.public ov12_0223A7D4
.public ov12_0223A7D8
.public BattleSystem_GetBgConfig
.public BattleSystem_GetWindow
.public BattleSystem_GetBattleType
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetOpponentData
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetParty
.public BattleSystem_GetPartySize
Expand All @@ -128,19 +128,19 @@
.public ov12_0223A8F4
.public ov12_0223A930
.public ov12_0223A938
.public ov12_0223A93C
.public BattleSystem_GetPokedex
.public ov12_0223A9A4
.public ov12_0223A9A8
.public BattleSystem_GetMessageBuffer
.public ov12_0223AAB8
.public ov12_0223AAD8
.public BattleSystem_GetFieldSide
.public ov12_0223AB34
.public ov12_0223AB3C
.public BattleSystem_GetMessageIcon
.public BattleSystem_GetPcStorage
.public BattleSystem_GetTerrainId
.public ov12_0223AB60
.public ov12_0223B520
.public ov12_0223B6CC
.public ov12_0223B718
.public BattleSystem_GetLocation
.public BattleSystem_GetTimezone
.public BattleSystem_GetOptions
.public BattleSystem_GetTextFrameDelay
.public ov12_0223B870
.public ov12_0223BB1C
.public ov12_0223BB28
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_12_battle_controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.public _s32_div_f
.public _u32_div_f
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetBattleContext
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetParty
.public BattleSystem_GetPartyMon
Expand All @@ -37,7 +37,7 @@
.public BattleSystem_GetBattlerIdPartner
.public ov12_0223ABB8
.public ov12_0223B688
.public ov12_0223B6B4
.public BattleSystem_GetSafariBallCount
.public ov12_0223B854
.public BattleSystem_GetWinLoseFlags
.public ov12_0223BDC4
Expand Down
18 changes: 9 additions & 9 deletions asm/include/overlay_12_battle_controller_opponent.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@
.public ov12_02237B0C
.public ov12_02237BB8
.public ov12_02237ED0
.public ov12_0223A7D4
.public ov12_0223A7D8
.public BattleSystem_GetBgConfig
.public BattleSystem_GetWindow
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetBattleContext
.public BattleSystem_GetOpponentData
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetParty
.public BattleSystem_GetPartySize
Expand All @@ -168,14 +168,14 @@
.public ov12_0223A938
.public ov12_0223A99C
.public BattleSystem_GetTrainerIndex
.public ov12_0223A9F4
.public BattleSystem_GetTrainer
.public BattleSystem_GetPlayerProfile
.public ov12_0223AA80
.public ov12_0223AAC8
.public BattleSystem_GetBag
.public BattleSystem_GetTrainerGender
.public ov12_0223AAD8
.public ov12_0223AB0C
.public BattleSystem_GetFieldSide
.public ov12_0223AB34
.public BattleSystem_GetMessageIcon
.public BattleSystem_GetTerrainId
.public ov12_0223AB54
.public BattleSystem_GetBattlerIdPartner
Expand All @@ -185,7 +185,7 @@
.public ov12_0223B688
.public ov12_0223B694
.public BattleSystem_AreBattleAnimationsOn
.public ov12_0223B718
.public BattleSystem_GetTextFrameDelay
.public ov12_0223B750
.public BattleSystem_GetChatotVoice
.public ov12_0223B874
Expand Down
16 changes: 8 additions & 8 deletions asm/include/overlay_12_battle_controller_player.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@
.public ov10_02220AAC
.public ov12_02237ED0
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetBattleContext
.public BattleSystem_GetOpponentData
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetParty
.public ov12_0223A9F4
.public BattleSystem_GetTrainer
.public BattleSystem_GetPlayerProfile
.public ov12_0223AA80
.public ov12_0223AA84
.public BattleSystem_GetBag
.public BattleSystem_GetBagCursor
.public ov12_0223AB0C
.public BattleSystem_GetFieldSide
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleSpecial
.public ov12_0223B6B4
.public ov12_0223B6C0
.public ov12_0223B740
.public BattleSystem_GetSafariBallCount
.public BattleSystem_SetSafariBallCount
.public BattleSystem_GetBattleStyle
.public ov12_0223BB64
.public BattleSystem_GetWinLoseFlags
.public ov12_0223BD20
Expand Down
50 changes: 25 additions & 25 deletions asm/include/overlay_12_battle_system.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
.public MIi_CpuCopy32
.public _s32_div_f
.public _u32_div_f
.public ov12_0223A7D4
.public ov12_0223A7D8
.public BattleSystem_GetBgConfig
.public BattleSystem_GetWindow
.public BattleSystem_GetBattleType
.public ov12_0223A7E4
.public BattleSystem_GetOpponentDataByBattlerId
.public BattleSystem_GetBattleContext
.public BattleSystem_GetOpponentData
.public BattleSystem_GetMaxBattlers
.public BattleSystem_GetParty
.public BattleSystem_GetPartySize
Expand All @@ -82,12 +82,12 @@
.public ov12_0223A900
.public ov12_0223A908
.public ov12_0223A914
.public ov12_0223A920
.public ov12_0223A928
.public BattleSystem_GetHpFont
.public BattleSystem_GetLevelFont
.public ov12_0223A930
.public ov12_0223A934
.public ov12_0223A938
.public ov12_0223A93C
.public BattleSystem_GetPokedex
.public BattleSystem_GetSendBufferPtr
.public BattleSystem_GetRecvBufferPtr
.public ov12_0223A954
Expand All @@ -98,43 +98,43 @@
.public ov12_0223A990
.public ov12_0223A99C
.public ov12_0223A9A4
.public ov12_0223A9A8
.public BattleSystem_GetMessageBuffer
.public BattleSystem_GetTrainerIndex
.public ov12_0223A9F4
.public BattleSystem_GetTrainer
.public BattleSystem_GetPlayerProfile
.public ov12_0223AA80
.public ov12_0223AA84
.public BattleSystem_GetBag
.public BattleSystem_GetBagCursor
.public BattleSystem_GetMonBall
.public ov12_0223AAB8
.public ov12_0223AAC8
.public BattleSystem_GetTrainerGender
.public ov12_0223AAD8
.public ov12_0223AB0C
.public BattleSystem_GetFieldSide
.public ov12_0223AB34
.public ov12_0223AB3C
.public BattleSystem_GetMessageIcon
.public BattleSystem_GetPcStorage
.public BattleSystem_GetTerrainId
.public ov12_0223AB54
.public ov12_0223AB60
.public BattleSystem_GetLocation
.public BattleSystem_GetBattlerIdPartner
.public ov12_0223ABB8
.public BattleSystem_RecoverStatus
.public BattleSystem_GetBattleSpecial
.public ov12_0223B520
.public BattleSystem_GetTimezone
.public ov12_0223B52C
.public ov12_0223B580
.public ov12_0223B5EC
.public BattleSystem_CheckEvolution
.public ov12_0223B688
.public ov12_0223B694
.public ov12_0223B6B4
.public ov12_0223B6C0
.public ov12_0223B6CC
.public BattleSystem_GetSafariBallCount
.public BattleSystem_SetSafariBallCount
.public BattleSystem_GetOptions
.public BattleSystem_AreBattleAnimationsOn
.public ov12_0223B708
.public ov12_0223B718
.public ov12_0223B740
.public BattleSystem_GetFrame
.public BattleSystem_GetTextFrameDelay
.public BattleSystem_GetBattleStyle
.public ov12_0223B750
.public BattleSystem_GetChatotVoice
.public ov12_0223B798
.public BattleSystem_TryChangeForm
.public ov12_0223B854
.public ov12_0223B870
.public ov12_0223B874
Expand Down Expand Up @@ -206,7 +206,7 @@
.public ov12_0223C4E8
.public GetBattlerVar
.public SetBattlerVar
.public ov12_0224F794
.public AddBattlerVar
.public ov12_022581D4
.public ov12_022582B8
.public ov12_02261258
Expand Down
Loading