Battle Overlay Progress + General Documentation #152
Conversation
Theyre a mess sorry
Both of these were upwards of 100 case switch statements, so they get their own commit
include/battle.h
Outdated
| //This is information used for selecting a target on the bottom screen in a double battle | ||
| typedef struct TargetPokemon { | ||
| u8 selectedMon; | ||
| u8 gender : 2, |
There was a problem hiding this comment.
idk if it's just me but imo every member of the bitfield should have an explicit type attached, feels weird to see it without
There was a problem hiding this comment.
it doesn't make a difference compile-wise, the only reason I have it like that is to make it easier to see what's in the same 8 bit area in the bitfield. Totally willing to change it though
| @@ -126,34 +127,34 @@ typedef struct UnkBtlCtxSub_76 { | |||
| typedef struct UnkBattlemonSub { | |||
There was a problem hiding this comment.
can this struct be named? it seems to be about moves that affect the battle status
There was a problem hiding this comment.
I'm very open to suggestions if you have any
There was a problem hiding this comment.
ehhh it also includes the flags for custap and quick claw triggers, but those might arguably be related to moves? it's less move statuses though and more just flags, counts, etc
include/battle.h
Outdated
| //This is information used for selecting a target on the bottom screen in a double battle | ||
| typedef struct TargetPokemon { | ||
| u8 selectedMon; | ||
| u8 gender : 2, |
| @@ -3,7 +3,7 @@ | |||
|
|
|||
| #include "heap.h" | |||
|
|
|||
| struct ZknHeightWeight { | |||
| struct PokedexData { | |||
| mon->unk88.bindingMove = *data16; | ||
| break; | ||
| case BMON_DATA_HELD_ITEM_RESTORE_HP: | ||
| mon->unk88.unk30 = *data32; |
| if (ctx->unk_2174 & (1 << 29)) { | ||
| *out = ov12_02258348(ctx, 2, ctx->unk_2174); | ||
| ctx->unk_2174 = 0; | ||
| if (!(ctx->moveStatusFlag & 0x801FDA49)) { |
There was a problem hiding this comment.
this seems like a completely arbitrary number. any chance for constant or explanation comment?
There was a problem hiding this comment.
tbh I have no idea what the number means, the original has it as "WAZA_STATUS_FLAG_NO_OUT," so my best guess is that it's probably a concatenation of all the move statuses that can return something? regardless, I'd rather wait until I can define it as a concatenation once I get to the move status constants
If I missed a bitfield declaration let me know
Battle overlays won't be done for awhile, but since I'm changing (aka documenting) a lot of files as I go along, I figure I should keep a PR open to be merged from time to time so I don't get too out of sync with the master branch. Since some of the battle overlay files are 20k+ lines long and can't be split any further, I'm ok merging these while incomplete as long as the other reviewers are also ok with that.