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

Exp Task #264

merged 48 commits into from
Dec 24, 2023

Conversation

adrienntindall
Copy link
Collaborator

No description provided.

@red031000
Copy link
Member

rebase pls

Copy link
Contributor

@cbt6 cbt6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too many to list but use constants for message ids, e.g.:

-msg.id = 1; // "{0} gained {1} Exp. Points!"
+msg.id = msg_0197_00001;

-msg.id = 1179; // "But {0} can't learn more than four moves."
+msg.id = msg_0197_01179;

-BattleController_EmitDrawYesNoBox(data->bsys, data->ctx, expBattler, 1180, 1, 0, 0);
+BattleController_EmitDrawYesNoBox(data->bsys, data->ctx, expBattler, msg_0197_01180, 1, 0, 0);

src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_022378C0.c Outdated Show resolved Hide resolved
src/battle/battle_022378C0.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wew thats a long one

include/render_text.h Outdated Show resolved Hide resolved
include/render_window.h Outdated Show resolved Hide resolved
src/battle/battle_command.c Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_02261FD4.c Outdated Show resolved Hide resolved
src/battle/battle_02261FD4.c Outdated Show resolved Hide resolved
src/battle/battle_02261FD4.c Outdated Show resolved Hide resolved
tgsm
tgsm previously approved these changes Nov 30, 2023
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also debating about the renaming of bsys to battleSystem and int to s32 but that's technically out of scope

main.lsf Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/trainer_ai.c Outdated Show resolved Hide resolved
src/battle/trainer_ai.c Outdated Show resolved Hide resolved
src/battle/trainer_ai.c Outdated Show resolved Hide resolved
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

few minor things, but provided more isn't changed/added after these are addressed, I'd say it's ready to merge

include/battle/battle_system.h Outdated Show resolved Hide resolved
include/battle/overlay_12_02266024.h Outdated Show resolved Hide resolved
include/battle/trainer_ai.h Show resolved Hide resolved
src/battle/battle_022378C0.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
src/list_menu_2d.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please please please don't add more after addressing this review, otherwise we'll be stuck in an endless cycle of you addressing, then adding more, then I review, and you address, and add more etc.

include/battle/battle.h Show resolved Hide resolved
include/battle/battle_controller_player.h Show resolved Hide resolved
src/battle/battle_command.c Outdated Show resolved Hide resolved
src/battle/battle_controller_player.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Outdated Show resolved Hide resolved
src/battle/battle_system.c Show resolved Hide resolved
src/battle/battle_system.c Show resolved Hide resolved
src/battle/trainer_ai.c Show resolved Hide resolved
PikalaxALT
PikalaxALT previously approved these changes Dec 24, 2023
@adrienntindall adrienntindall merged commit 4177faf into pret:master Dec 24, 2023
1 check passed
github-actions bot pushed a commit that referenced this pull request Dec 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants