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

Finish functions for overlay_12_0224E4FC.c #195

Merged
merged 27 commits into from
Jul 18, 2023
Merged

Finish functions for overlay_12_0224E4FC.c #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7165b02
Document SelfTurnData variables
adrienntindall Jul 9, 2023
d622a16
Finish functions
adrienntindall Jul 10, 2023
745f6f9
Merge branch 'master' into master
adrienntindall Jul 10, 2023
7e9abc1
Add arrays
adrienntindall Jul 12, 2023
3be54ba
Port move effect consts from @BluRosie's HGSS Engine
adrienntindall Jul 12, 2023
1e0f9e5
Battle script var constants
adrienntindall Jul 12, 2023
255c9f4
linkStatus -> battleStatus + add consts
adrienntindall Jul 12, 2023
c486464
Merge branch 'master' into master
adrienntindall Jul 12, 2023
625ce48
Rename functions
adrienntindall Jul 12, 2023
1819ff5
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jul 12, 2023
8576608
Update consts
adrienntindall Jul 12, 2023
953de5d
Merge branch 'master' into master
adrienntindall Jul 13, 2023
60f923e
tab
adrienntindall Jul 13, 2023
6de58fb
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jul 13, 2023
32b5d04
Starting progress on Battle Controller Player again
adrienntindall Jul 14, 2023
fa25f5b
Selection Screen Input
adrienntindall Jul 15, 2023
8caa3f5
Update Battle Type constants
adrienntindall Jul 15, 2023
b67b813
Document CONTROLLER_COMMAND_RUN_SCRIPT
adrienntindall Jul 15, 2023
02ff7eb
Next function is large
adrienntindall Jul 15, 2023
df1ed9a
Merge branch 'master' into master
red031000 Jul 15, 2023
1676388
Add consts
adrienntindall Jul 15, 2023
0486bf7
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jul 15, 2023
fbf8684
Definitely did not remove pedantic flag
adrienntindall Jul 16, 2023
179a450
Update Field Condition
adrienntindall Jul 17, 2023
32ead88
Merge branch 'master' into master
red031000 Jul 18, 2023
2c8fe78
Re-enabled pedantic flag =(
adrienntindall Jul 18, 2023
209811e
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jul 18, 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_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
.public BattleSystem_GetFieldSide
.public BattleSystem_GetTerrainId
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B52C
.public ov12_0223B5EC
.public ov12_0223B708
Expand Down
178 changes: 0 additions & 178 deletions asm/include/overlay_12_0224E4FC.inc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
.public BattleController_EmitDrawYesNoBox
.public BattleController_EmitPrintAttackMessage
.public BattleController_EmitPrintMessage
.public BattleController_SetMoveEffect
.public BattleController_SetMoveAnimation
.public ov12_0226343C
.public BattleController_EmitMonFlicker
.public BattleController_EmitHealthbarUpdate
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -179,7 +179,7 @@
.public BattleSystem_GetTerrainId
.public ov12_0223AB54
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B52C
.public ov12_0223B580
.public ov12_0223B688
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -37,7 +37,7 @@
.public ov12_0223AB0C
.public BattleSystem_GetFieldSide
.public BattleSystem_GetBattlerIdPartner
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B6B4
.public ov12_0223B6C0
.public ov12_0223B740
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_system.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
.public BattleSystem_GetBattlerIdPartner
.public ov12_0223ABB8
.public BattleSystem_RecoverStatus
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223B520
.public ov12_0223B52C
.public ov12_0223B580
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_02074E5C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
.public ov12_0223A978
.public ov12_0223A984
.public ov12_0223A990
.public BattleSystem_GetBattleFlags
.public BattleSystem_GetBattleSpecial
.public ov12_0223BBFC
.public ov12_0223BC08
.public ov12_0223BC14
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_12_022378C0.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3796,7 +3796,7 @@ _022398A0:
cmp r0, #0
bne _022398BE
add r0, r5, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x10
tst r0, r1
beq _022398D6
Expand All @@ -3807,7 +3807,7 @@ _022398BE:
cmp r0, #0
bne _022398FE
add r0, r5, #0
bl BattleSystem_GetBattleFlags
bl BattleSystem_GetBattleSpecial
mov r1, #0x10
tst r0, r1
beq _022398FE
Expand Down
Loading