forme -> form #178
forme -> form #178
Conversation
asm/scrcmd_move_tutor.s
Outdated
| ; Convert species and forme into | ||
| thumb_func_start SpeciesAndFormToMoveTutorIndex | ||
| SpeciesAndFormToMoveTutorIndex: ; 0x02202C7C | ||
| ; Convert species and formeinto |
There was a problem hiding this comment.
messed up the comments here but it's nbd
| ## for set in tutor | ||
| oshie_begin | ||
| ## for move in set.moves | ||
| oshie_add {{ move }} | ||
| ## endfor | ||
| oshie_end | ||
| ## endfor | ||
| .size gWazaOshieMoves,.-gWazaOshieMoves | ||
| .size gMoveTutorMoves,.-gMoveTutorMoves |
There was a problem hiding this comment.
can we change this file's name too while we're at it?
There was a problem hiding this comment.
that might be a bit more difficult, since the stuff is passed into o2narc iirc
include/overlay_94.h
Outdated
| int state; | ||
| int effectTimer; | ||
| int duration; | ||
| int species; | ||
| int fileId; | ||
| int partyMonIndex; //same information as B's unkc65 | ||
| ParticleSystem* particleSystem; | ||
| } IconFormeChangeWork; | ||
| } IconFormChangeWork; |
There was a problem hiding this comment.
Since you're wanting to remove the work notation I'll point it out whenever I see it/you can do the same for me in my reviews and we'll work towards phasing them out. Generally data should work if it seems too awkward to just cut the word out entirely. So this struct could be IconFormChange or IconFormChangeData or anything else but IconFormChangeWork
include/overlay_94.h
Outdated
| } PartyMenuStruct; | ||
|
|
||
| void PartyMenu_InitIconFormeChangeWork(PartyMenuStruct* unkPtr); | ||
| BOOL PartyMenu_AnimateIconFormeChange(PartyMenuStruct* unkPtr); | ||
| void PartyMenu_InitIconFormChangeWork(PartyMenuStruct* unkPtr); |
There was a problem hiding this comment.
Phase out work notation in the function name
src/pokemon_icon_idx.c
Outdated
| u32 ret; | ||
|
|
||
| encry = AcquireBoxMonLock(boxMon); | ||
| species = GetBoxMonData(boxMon, MON_DATA_SPECIES, NULL); | ||
| isEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG, NULL); | ||
| forme = _BoxMonGetForme(boxMon); | ||
| ret = GetMonIconNaixEx(species, isEgg, forme); | ||
| form = _BoxMonGetForm(boxMon); |
There was a problem hiding this comment.
Any reason why there's a missing prefix here?
No description provided.