diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-08-12 17:26:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 17:26:01 -0700 |
| commit | d9883945954a30e4b753ecbd5d807f4b6cd2a38a (patch) | |
| tree | 093c45ab4de91a75d546f58a6672dfc72136677c /src/code_8012A18_1.c | |
| parent | e005410884803f1ec8f5942bd0c8d2da5c2e29c8 (diff) | |
More data dumping and some code cleaning (#46)
* more data dumping and some code cleaning
* split out cutscene scripts
* initial start at script conversion
* more script work
* use correct type
* clearer up struct field names
* split known scripts into seperate files
* no need to preproc pure ascii strings in debug
* more cutscene work
* split out personality test scripts
* solidify text macros and doc some dungeon fields
* more scripting work
Diffstat (limited to 'src/code_8012A18_1.c')
| -rw-r--r-- | src/code_8012A18_1.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c index e91d971..15cac81 100644 --- a/src/code_8012A18_1.c +++ b/src/code_8012A18_1.c @@ -31,7 +31,7 @@ extern s32 sub_80144A4(s32 *); extern void sub_80151C0(u32, u8 *); extern void CreateConfirmNameMenu(void); extern void sub_80160F4(u32); -bool8 sub_80162B8(void); +bool8 IsNameEmpty(void); extern u32 sub_80154F0(void); extern void sub_80155F0(void); extern void sub_80922B4(u8 *, u8 *, s32); @@ -171,10 +171,10 @@ void sub_8016110(void) case 1: CreateConfirmNameMenu(); if (gUnknown_203B200->unk4 == 1) { - sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName,10); + sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH); } else { - sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName,10); + sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH); } // Is the name #C5$m0#R OK? sub_8014248(&gUnknown_80DB688,0,3,gUnknown_203B200->menus,0,4,0,0,0x20); @@ -210,11 +210,11 @@ void sub_80161F8(void) if (sub_80154F0() == 3) { sub_80155F0(); - if (sub_80162B8()) { + if (IsNameEmpty()) { sub_80160F4(3); } else{ - iVar2 = sub_8015FEC(gUnknown_203B200->pokeName,10); + iVar2 = sub_8015FEC(gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH); maxLength = sub_8016028(); // returns 60 if (iVar2 > maxLength) { sub_80160F4(2); @@ -265,19 +265,19 @@ void sub_801629C(void) } } -bool8 sub_80162B8(void) +bool8 IsNameEmpty(void) { u8 character; s32 index; s32 max; - max = 10; // constant needed at top of loop to match + max = POKEMON_NAME_LENGTH; // constant needed at top of loop to match index = 0; do { character = gUnknown_203B200->pokeName[index]; if (character == '\0') break; - if (character != ' ') return 0; + if (character != ' ') return FALSE; index++; } while (index < max); - return 1; + return TRUE; } |