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.

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

Exp Task #264

Merged
merged 48 commits into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
453be7a
Add GX Plane Mask constants
adrienntindall Oct 18, 2023
3d56715
Port exp function from plat
adrienntindall Nov 3, 2023
0a2e881
Merge branch 'master' into master
adrienntindall Nov 3, 2023
31c2acf
Merge remote-tracking branch 'upstream/master'
adrienntindall Nov 16, 2023
fdb788e
Merge branch 'master' into master
red031000 Nov 16, 2023
2ff5b0d
Update battle_022378C0.c
adrienntindall Nov 16, 2023
d684b64
Update constants
adrienntindall Nov 16, 2023
881ba91
Decompile battle_02261FD4
adrienntindall Nov 16, 2023
b36e83f
Added message consts to battle_command
adrienntindall Nov 17, 2023
fa7714c
Indentation and stuff
adrienntindall Nov 21, 2023
0be4302
Update battle_command.c
adrienntindall Nov 28, 2023
b4d5132
Merge remote-tracking branch 'upstream/master'
adrienntindall Nov 28, 2023
a07a825
Merge branch 'master' into master
adrienntindall Nov 28, 2023
e0794d5
Start work on trainer ai decomp (overlay 10)
adrienntindall Nov 28, 2023
564374a
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Nov 28, 2023
2951dc8
UnkBtlCtxSub_76 -> TrainerAIData
adrienntindall Nov 28, 2023
a1b964d
ov10_0221BEF4
adrienntindall Nov 28, 2023
1dbd590
rename overlay_10.s
adrienntindall Nov 28, 2023
cb7a13e
Update src/battle/battle_02261FD4.c
adrienntindall Nov 30, 2023
dc16cd7
Update src/battle/battle_02261FD4.c
adrienntindall Nov 30, 2023
526fb13
Update src/battle/battle_02261FD4.c
adrienntindall Nov 30, 2023
3f1b5c6
Add consts, etc
adrienntindall Dec 16, 2023
0cabedb
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Dec 16, 2023
c8e43a9
Merge branch 'master' into master
adrienntindall Dec 16, 2023
78a89dc
More bsys functions
adrienntindall Dec 17, 2023
3a696b7
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Dec 17, 2023
24a06bb
Update src/battle/battle_02261FD4.c
adrienntindall Dec 17, 2023
c2d87dc
Decomp battle print message functions
adrienntindall Dec 17, 2023
4b1cf5c
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Dec 17, 2023
067c7f4
add OFFSET_OF macro
adrienntindall Dec 17, 2023
a2d94ac
Update AddTextPrinterParameterized params
adrienntindall Dec 18, 2023
3b3b6c8
Add message tag constants
adrienntindall Dec 19, 2023
3520198
Document battle_system static functions
adrienntindall Dec 19, 2023
8ce73b5
Document BattleSystem->MessageFormat field
adrienntindall Dec 19, 2023
88c9143
Finish decompiling battle_system.c
adrienntindall Dec 19, 2023
74d1e5c
Address review changes
adrienntindall Dec 19, 2023
4754b34
Merge branch 'master' into master
adrienntindall Dec 19, 2023
b3e6499
Battle Controller Player Safari Functions
adrienntindall Dec 20, 2023
6c85dc5
Merge branch 'master' into master
adrienntindall Dec 21, 2023
5d4c08f
Disobedience code
adrienntindall Dec 22, 2023
3e1a975
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Dec 22, 2023
ca68608
Merge branch 'master' into master
adrienntindall Dec 22, 2023
ca84bad
Update src/battle/battle_system.c
adrienntindall Dec 22, 2023
def7e95
Update src/battle/battle_system.c
adrienntindall Dec 22, 2023
61783f7
Minor documentation
adrienntindall Dec 22, 2023
af75586
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Dec 22, 2023
196ce4b
requested changes
adrienntindall Dec 24, 2023
f77b177
StatStruct -> PokemonStats
adrienntindall Dec 24, 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
2 changes: 1 addition & 1 deletion asm/include/overlay_07.inc
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,4 @@
.public ov12_0223BB88
.public ov12_0223C1C4
.public ov12_0223C1F4
.public ov12_0223C340
.public BattleSystem_SetDefaultBlend
4 changes: 2 additions & 2 deletions asm/include/overlay_12_02264824.inc
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
.public ov12_0223A8EC
.public BattleSystem_GetHpFont
.public BattleSystem_GetLevelFont
.public ov12_0223A930
.public BattleSystem_GetMessageData
.public BattleSystem_GetPaletteData
.public ov12_0223A9A4
.public BattleSystem_GetMessageFormat
.public ov12_0226498C
.public BattleHpBar_LoadResources
.public BattleHpBar_FreeResources
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_12_02266024.inc
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
.public BattleSystem_GetPartyMon
.public ov12_0223A8E4
.public ov12_0223A8EC
.public ov12_0223A930
.public BattleSystem_GetMessageData
.public BattleSystem_GetPaletteData
.public ov12_0223A9A4
.public BattleSystem_GetMessageFormat
.public ov12_0223AAD8
.public ov12_0223AB54
.public BattleSystem_GetSafariBallCount
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_0226ADE0.inc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.public GF_AssertFail
.public G2x_SetBlendAlpha_
.public MI_CpuFill8
.public ov12_0223C340
.public BattleSystem_SetDefaultBlend
.public ov12_0226ADE0
.public ov12_0226AE78
.public ov12_0226AEE0
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_12_battle_command.inc
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
.public ov12_0223A8E4
.public ov12_0223A8EC
.public ov12_0223A8F4
.public ov12_0223A930
.public BattleSystem_GetMessageData
.public BattleSystem_GetPaletteData
.public BattleSystem_GetPokedex
.public ov12_0223A9A4
.public BattleSystem_GetMessageFormat
.public BattleSystem_GetMessageBuffer
.public ov12_0223AAB8
.public ov12_0223AAD8
Expand All @@ -152,9 +152,9 @@
.public BattleSystem_Random
.public ov12_0223C134
.public ov12_0223C224
.public ov12_0223C2F0
.public ov12_0223C330
.public ov12_0223C494
.public BattleSystem_SetPokedexCaught
.public BattleSystem_CheckMonCaught
.public BattleSystem_PrintBattleMessage
.public ov12_0223C4E8
.public BtlCmd_PlayEncounterAnimation
.public BtlCmd_PokemonEncounter
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller.inc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.public BattleSystem_GetRandTemp
.public ov12_0223BE68
.public ov12_0223C140
.public ov12_0223C330
.public BattleSystem_CheckMonCaught
.public ov12_0224ECC4
.public ov12_0224ED00
.public ov12_0224EDC0
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_12_battle_controller_opponent.inc
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
.public ov12_0223A900
.public ov12_0223A908
.public ov12_0223A914
.public ov12_0223A930
.public BattleSystem_GetMessageData
.public ov12_0223A934
.public BattleSystem_GetPaletteData
.public ov12_0223A99C
Expand Down Expand Up @@ -222,8 +222,8 @@
.public ov12_0223C1A0
.public ov12_0223C1C4
.public ov12_0223C1F4
.public ov12_0223C34C
.public ov12_0223C494
.public BattleSystem_PrintTrainerMessage
.public BattleSystem_PrintBattleMessage
.public GetBattlerVar
.public ov12_022506D4
.public ov12_02251D28
Expand Down
222 changes: 0 additions & 222 deletions asm/include/overlay_12_battle_system.inc

This file was deleted.

4 changes: 2 additions & 2 deletions asm/overlay_07.s
Original file line number Diff line number Diff line change
Expand Up @@ -1872,7 +1872,7 @@ _0221CADE:
add r0, r5, r0
mov r1, #5
bl ov07_0221DD14
bl ov12_0223C340
bl BattleSystem_SetDefaultBlend
add r0, r5, #0
mov r1, #1
bl ov07_0221FAEC
Expand Down Expand Up @@ -5004,7 +5004,7 @@ _0221E224:
strb r0, [r4, #5]
b _0221E272
_0221E250:
bl ov12_0223C340
bl BattleSystem_SetDefaultBlend
mov r0, #2
mov r1, #0
bl ToggleBgLayer
Expand Down
Loading