Skip to content

Commit

Permalink
DisplayMessage
Browse files Browse the repository at this point in the history 
DisplayMessage -> Pokedex_DisplayMessage
  • Loading branch information
@h2o-DS
h2o-DS committed Jan 19, 2025
1 parent ea785f7 commit d0ab817
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion include/overlay021/ov21_021D4C0C.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0);
void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0);
Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2);
void ov21_021D4DA0(Window *param0);
u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset);
u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset);
void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3);
void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4);

Expand Down
2 changes: 1 addition & 1 deletion src/overlay021/ov21_021D4C0C.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void ov21_021D4DA0(Window *param0)
Windows_Delete(param0, 1);
}

u32 DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset)
u32 Pokedex_DisplayMessage(UnkStruct_ov21_021D4C0C *param0, Window *window, u32 bankID, u32 entryID, int xOffset, int yOffset)
{
MessageLoader *messageLoader;
Strbuf *strbuf;
Expand Down
10 changes: 5 additions & 5 deletions src/overlay021/ov21_021D76B0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(v3->unk_14C, 10, 4);

DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_search, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_search, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = param0->unk_00[0];
Expand All @@ -707,7 +707,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77

ov21_021D4DA0(v0);
v0 = ov21_021D4D6C(v3->unk_14C, 10, 4);
DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_switch, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_switch, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = param0->unk_00[1];
Expand All @@ -721,7 +721,7 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77

ov21_021D4DA0(v0);
v0 = ov21_021D4D6C(v3->unk_14C, 10, 4);
DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_check, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_check, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = param0->unk_00[2];
Expand All @@ -733,9 +733,9 @@ static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
v0 = ov21_021D4D6C(v3->unk_14C, 14, 2);

if (param2->unk_1C->unk_04->unk_1740 == 0) {
DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_quit, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_quit, 0, 0);
} else {
DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_cancel, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_cancel, 0, 0);
}

v1.unk_04 = v0;
Expand Down
18 changes: 9 additions & 9 deletions src/overlay021/ov21_021D94BC.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2753,7 +2753,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C

v1 = sub_0201FAB4(param1->unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(param2, 8, 2);
v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_order, 0, 0);
v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_order, 0, 0);

param1->unk_04 = v0;
param1->unk_0C = param0->unk_00[1];
Expand All @@ -2765,7 +2765,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(param2, 8, 2);
v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_name, 0, 0);
v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_name, 0, 0);

param1->unk_04 = v0;
param1->unk_0C = param0->unk_00[2];
Expand All @@ -2777,7 +2777,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(param2, 8, 2);
v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_type, 0, 0);
v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_type, 0, 0);

param1->unk_04 = v0;
param1->unk_0C = param0->unk_00[3];
Expand All @@ -2789,7 +2789,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(param2, 8, 2);
v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_form, 0, 0);
v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_form, 0, 0);

param1->unk_04 = v0;
param1->unk_0C = param0->unk_00[4];
Expand All @@ -2801,7 +2801,7 @@ static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(param2, 8, 2);
v2 = DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_ok, 0, 0);
v2 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, pl_msg_pokedex_ok, 0, 0);

param1->unk_04 = v0;
param1->unk_0C = param0->unk_00[5];
Expand Down Expand Up @@ -2870,7 +2870,7 @@ static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
break;
}

v4 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);
v4 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);

param1->unk_10 = -v4 / 2;
param1->unk_04 = v0;
Expand Down Expand Up @@ -2929,7 +2929,7 @@ static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
break;
}

v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);
v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);

param1->unk_10 = -v5 / 2;
param1->unk_04 = v0;
Expand Down Expand Up @@ -2988,7 +2988,7 @@ static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
break;
}

v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);
v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);

param1->unk_10 = -v5 / 2;
param1->unk_04 = v0;
Expand Down Expand Up @@ -3044,7 +3044,7 @@ static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4C
break;
}

v5 = DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);
v5 = Pokedex_DisplayMessage(param2, v0, message_bank_pokedex, entryID, 0, 0);

param1->unk_10 = -v5 / 2;
param1->unk_04 = v0;
Expand Down
4 changes: 2 additions & 2 deletions src/overlay021/ov21_021DC9BC.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0

v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DMAIN);
v0 = ov21_021D4D6C(v3->unk_14C, 16, 2);
v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_areaunknown, 0, 0);
v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_areaunknown, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = mapDisplay->AreaUnknownCellActor;
Expand All @@ -669,7 +669,7 @@ static void ov21_021DD2E0(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0

for (v5 = 0; v5 < 3; v5++) {
v0 = ov21_021D4D6C(v3->unk_14C, 9, 2);
v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_morning + v5, 0, 0);
v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_morning + v5, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = NULL;
Expand Down
4 changes: 2 additions & 2 deletions src/overlay021/ov21_021E1924.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(v3->unk_14C, 8, 4);

DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_next, 0, 0);
Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_next, 0, 0);

v1.unk_04 = v0;
v1.unk_0C = param0->unk_00[0];
Expand All @@ -814,7 +814,7 @@ static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
v0 = ov21_021D4D6C(v3->unk_14C, 8, 4);

{
u32 v6 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_back, 0, 0);
u32 v6 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_back, 0, 0);
v1.unk_10 = 32 - v6;
}

Expand Down
2 changes: 1 addition & 1 deletion src/overlay021/ov21_021E29DC.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32
for (v4 = 0; v4 < 5; v4++) {
v0 = ov21_021D4D6C(v2->unk_14C, 8, 2);

DisplayMessage(v2->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_info + v4, 0, 0);
Pokedex_DisplayMessage(v2->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_info + v4, 0, 0);

v1.unk_04 = v0;
param1->unk_04[v4] = ov21_021D4CA0(&v1);
Expand Down
4 changes: 2 additions & 2 deletions src/overlay021/ov21_021E4CA4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(v3->unk_14C, 8, 2);

v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_chorus, 0, 0);
v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_chorus, 0, 0);
v1.unk_10 = 64 - v5 / 2;
v1.unk_04 = v0;

Expand All @@ -949,7 +949,7 @@ static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(v3->unk_14C, 8, 2);
v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_pan, 0, 0);
v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_pan, 0, 0);

v1.unk_10 = 64 - v5 / 2;
v1.unk_04 = v0;
Expand Down
4 changes: 2 additions & 2 deletions src/overlay021/ov21_021E68F4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A

v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(v3->unk_14C, 12, 2);
v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_heightcheck_button, 0, 0);
v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_heightcheck_button, 0, 0);

v1.unk_10 = -(v5 / 2);
v1.unk_04 = v0;
Expand All @@ -635,7 +635,7 @@ static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
ov21_021D4DA0(v0);

v0 = ov21_021D4D6C(v3->unk_14C, 12, 2);
v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_weightcheck_button, 0, 0);
v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_weightcheck_button, 0, 0);

v1.unk_10 = -(v5 / 2);
v1.unk_04 = v0;
Expand Down
2 changes: 1 addition & 1 deletion src/overlay021/ov21_021E8484.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85

v4 = sub_0201FAB4(v1.unk_08, NNS_G2D_VRAM_TYPE_2DSUB);
v0 = ov21_021D4D6C(v3->unk_14C, 16, 2);
v5 = DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_anotherform, 0, 0);
v5 = Pokedex_DisplayMessage(v3->unk_14C, v0, message_bank_pokedex, pl_msg_pokedex_anotherform, 0, 0);

v1.unk_10 = -(v5 / 2);
v1.unk_04 = v0;
Expand Down

0 comments on commit d0ab817

Please sign in to comment.