Compare commits

...

1 Commits

4 changed files with 14 additions and 19 deletions

View File

@@ -18,6 +18,15 @@ namespace ipl {
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
~TextBalloon();
static f32 getDefaultMargin16x9() {
f32 margin = 120.0f;
return margin;
}
static f32 getDefaultMargin4x3() {
f32 margin = 30.0f;
return margin;
}
void calc();
void draw();

View File

@@ -383,16 +383,6 @@ inline void ipl::scene::AddressEdit::set_textbox(nw4r::lyt::Pane* pane, u32 msgI
set_textbox(pane, ipl::System::getMessage(msgId));
}
static inline f32 getBalloonMargin4x3() {
f32 margin = 30.0f;
return margin;
}
static inline f32 getBalloonMargin16x9() {
f32 margin = 120.0f;
return margin;
}
#pragma push
#pragma ppc_iro_level 1
void ipl::scene::AddressEdit::create() {
@@ -578,7 +568,7 @@ create_mode_done:
ipl::System::getKeyboard()->init();
mpBalloon = new ipl::scene::TextBalloon(getHeap(), mpBalloonFile, "arc",
"my_IplTopBalloon_a.brlyt", ipl::math::VEC3(0.0f, 0.0f, 0.0f), getBalloonMargin16x9(), getBalloonMargin4x3());
"my_IplTopBalloon_a.brlyt", ipl::math::VEC3(0.0f, 0.0f, 0.0f), ipl::scene::TextBalloon::getDefaultMargin16x9(), ipl::scene::TextBalloon::getDefaultMargin4x3());
}
#pragma pop

View File

@@ -87,11 +87,9 @@ namespace ipl {
mNwc24ErrCountdown2 = 0;
// Text balloon for Mii face
f32 f0 = 30.0f;
f32 f1 = 120.0f;
mpNigaoeBalloon =
new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt",
math::VEC3(0.0f, (f1 = 120.0f, 0.0f), (f0 = 30.0f, 0.0f)), f1, f0);
new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt", math::VEC3(0.0f, 0.0f, 0.0f),
TextBalloon::getDefaultMargin16x9(), TextBalloon::getDefaultMargin4x3());
// Scroller
mpScroller = new utility::YoungBScroller();

View File

@@ -91,10 +91,8 @@ namespace ipl {
mNwc24ErrCountdown = 0;
// Text balloon for Mii face
f32 f0 = 30.0f;
f32 f1 = 120.0f;
mpNigaoeBalloon = new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt",
math::VEC3(0.0f, (f1 = 120.0f, 0.0f), (f0 = 30.0f, 0.0f)), f1, f0);
mpNigaoeBalloon = new TextBalloon(getSceneHeap(), mpBalloonFile, "arc", "my_IplTopBalloon_a.brlyt", math::VEC3(0.0f, 0.0f, 0.0f),
TextBalloon::getDefaultMargin16x9(), TextBalloon::getDefaultMargin4x3());
// Scroller
mpScroller = new utility::YoungBScroller();