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

Documented and formatted a lot of files to sync with pokeemerald #636

Open
wants to merge 38 commits into
base: master
Choose a base branch
from

Conversation

HunarPG
Copy link

@HunarPG HunarPG commented Jul 30, 2023

No description provided.

…, wirelessWinTop, wirelessWinRight and wirelessWinBottom respectively
…nd STRINGID_GOTCHAPKMNCAUGHT2 to STRINGID_GOTCHAPKMNCAUGHTOLDMANORDUDE
@HunarPG
Copy link
Author

HunarPG commented Jul 31, 2023

And pushed more changes

@HunarPG HunarPG changed the title Documented asm folder, battle_ai_scripts.s and battle_ai_scripts_2.s Documented and formatted a lot of files to sync with pokeemerald Jul 31, 2023
Copy link
Member

@GriffinRichards GriffinRichards left a comment

Choose a reason for hiding this comment

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

Thanks! Keep in mind when syncing things between pokefirered and pokeemerald that just copying everything over isn't sufficient. There are many names pokefirered uses that are better than the equivalent in pokeemerald, and there are game differences to account for.

asm/macros/battle_ai_script.inc Outdated Show resolved Hide resolved
asm/macros/field_effect_script.inc Outdated Show resolved Hide resolved
asm/macros/asm.inc Show resolved Hide resolved
data/battle_ai_scripts.s Outdated Show resolved Hide resolved
data/battle_ai_scripts.s Outdated Show resolved Hide resolved
include/constants/battle_string_ids.h Outdated Show resolved Hide resolved
include/constants/map_scripts.h Outdated Show resolved Hide resolved
include/trade.h Outdated Show resolved Hide resolved
src/data/union_room.h Outdated Show resolved Hide resolved
src/pc_screen_effect.c Outdated Show resolved Hide resolved
…eld_effect_object_tmplate_pointers.h to extern const struct instead of const struct
…tatic bool8 and sMovementActionFuncs to gMovementActionFuncs matching emerald
…h and also changed sItemEffect to gItemEffect
…nst u32 in src/data/pokemon//tmhm_learnsets.h
Copy link
Member

@GriffinRichards GriffinRichards left a comment

Choose a reason for hiding this comment

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

The changes in 328d8d5 and e3b2f9c changing symbols from static to non-static is unnecessary. Same with b16ec26, and the additional bool8 -> u8 change in there is incorrect (the functions return TRUE/FALSE, so they should be bool8). Again please don't just copy from pokeemerald.

Comment on lines -12 to +15
#define tWin0Left data[3]
#define tWin0Right data[4]
#define tWin0Top data[5]
#define tWin0Bottom data[6]
#define tWinLeft data[3]
#define tWinRight data[4]
#define tWinTop data[5]
#define tWinBottom data[6]
Copy link
Member

Choose a reason for hiding this comment

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

Any reason for this change?

Copy link
Author

Choose a reason for hiding this comment

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

Is there any reason to keep 0 in between these names??
Like there is no tWin1Left, tWin2Left or something
And of course it's consistent with pokeemerald

@GriffinRichards GriffinRichards marked this pull request as draft August 13, 2023 22:38
@HunarPG HunarPG closed this May 4, 2024
@HunarPG HunarPG deleted the Pret_Master_2 branch May 4, 2024 11:46
@HunarPG HunarPG restored the Pret_Master_2 branch May 4, 2024 12:43
@HunarPG HunarPG reopened this May 4, 2024
@HunarPG HunarPG marked this pull request as ready for review May 18, 2024 04:34
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.

2 participants