diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2022-03-21 17:48:40 -0700 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2022-03-21 17:48:40 -0700 |
commit | 57f540b320ae8439fe4b42c6149641b877c7ea73 (patch) | |
tree | d131e5351b684a671cb8b5c62a7e8ed925ca773e /src/dungeon_2.c | |
parent | 46420815f4fd1f374ee48ee447bb42539e1a669c (diff) |
fix a few nonmatchings and code cleanup
Diffstat (limited to 'src/dungeon_2.c')
-rw-r--r-- | src/dungeon_2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dungeon_2.c b/src/dungeon_2.c index 18b6fe5..282ac99 100644 --- a/src/dungeon_2.c +++ b/src/dungeon_2.c @@ -11,7 +11,7 @@ extern const char gUnknown_8108F2C[]; extern u8 gUnknown_81077A8[]; extern u8 gUnknown_81077E8[]; -void sub_80901D8(struct unkPokeSubStruct_4 *param_1,struct unkPokeSubStruct_4 *param_2) +void sub_80901D8(struct DungeonLocation *param_1,struct DungeonLocation *param_2) { if ((u8)(param_2->dungeonIndex - DUNGEON_NORMAL_MAZE_2) < NUM_DUNGEON_MAZE) { param_1->dungeonIndex = DUNGEON_NORMAL_MAZE; @@ -22,12 +22,12 @@ void sub_80901D8(struct unkPokeSubStruct_4 *param_1,struct unkPokeSubStruct_4 *p } } -void PrintYellowDungeonNametoBuffer(u8 *buffer, struct unkPokeSubStruct_4 *dungeonLocation) +void PrintYellowDungeonNametoBuffer(u8 *buffer, struct DungeonLocation *dungeonLocation) { sprintf_2(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->dungeonIndex].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B) } -void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkPokeSubStruct_4 *dungeonLocation) +void PrintDungeonLocationtoBuffer(u8 *buffer, struct DungeonLocation *dungeonLocation) { if(gDungeons[dungeonLocation->dungeonIndex].stairDirection != 0){ sprintf_2(buffer, gUnknown_8108F18, gDungeonNames[dungeonLocation->dungeonIndex].name1, dungeonLocation->dungeonFloor); //_F @@ -38,7 +38,7 @@ void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkPokeSubStruct_4 *dungeon } } -void CopyDungeonName1toBuffer(u8 *buffer, struct unkPokeSubStruct_4 *dungeonLocation) +void CopyDungeonName1toBuffer(u8 *buffer, struct DungeonLocation *dungeonLocation) { strncpy(buffer, gDungeonNames[dungeonLocation->dungeonIndex].name1, 0x50); } @@ -63,13 +63,13 @@ u8 sub_80902C8(u8 dungeon) return gUnknown_81077E8[dungeon]; } -void xxx_save_poke_sub_4_80902F4(struct unkStruct_8094924* r0, struct unkPokeSubStruct_4* r1) +void SaveDungeonLocation(struct unkStruct_8094924* r0, struct DungeonLocation* r1) { SaveIntegerBits(r0, &r1->dungeonIndex, 0x7); SaveIntegerBits(r0, &r1->dungeonFloor, 0x7); } -void xxx_restore_poke_sub_4_8090314(struct unkStruct_8094924* r0, struct unkPokeSubStruct_4* r1) +void RestoreDungeonLocation(struct unkStruct_8094924* r0, struct DungeonLocation* r1) { r1->dungeonIndex = 0; r1->dungeonFloor = 0; |