summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2011-05-17 22:48:51 +0200
committerTreeki <treeki@gmail.com>2011-05-17 22:48:51 +0200
commit23e304c6fc6b08a6ea4bc93c8019eee2a68be67e (patch)
tree5205badc3427707ff1e59fd4779bab8d115c44bf
parent5495ac81a284b7c9b91f9dbc8452827b32f73212 (diff)
downloadkamek-23e304c6fc6b08a6ea4bc93c8019eee2a68be67e.tar.gz
kamek-23e304c6fc6b08a6ea4bc93c8019eee2a68be67e.zip
working on the HUD
Diffstat (limited to '')
-rw-r--r--kamek_ntsc.x14
-rw-r--r--kamek_ntsc2.x14
-rw-r--r--kamek_pal.x5
-rw-r--r--kamek_pal2.x14
-rw-r--r--src/wm_hud.cpp18
5 files changed, 62 insertions, 3 deletions
diff --git a/kamek_ntsc.x b/kamek_ntsc.x
index be7b03c..c2c8861 100644
--- a/kamek_ntsc.x
+++ b/kamek_ntsc.x
@@ -5,6 +5,15 @@ OUTPUT_FORMAT ("binary")
}*/
SECTIONS {
+ GetSpecificPlayerActor = 0x8005F900;
+ TimeStopFlag = 0x80429CFA;
+ TimerBranch = 0x800E39C8;
+ MarioDescentRate = 0x8042B864;
+ MarioJumpArc = 0x802F561C;
+ MarioJumpMax = 0x8042B848;
+ MiniMarioJumpArc = 0x802F5664;
+ MarioSize = 0x8042B874;
+
_savefpr_14 = 0x802DCCA8;
_savefpr_15 = 0x802DCCAC;
_savefpr_16 = 0x802DCCB0;
@@ -180,6 +189,11 @@ SECTIONS {
__ct__Q23m2d13EmbedLayout_cFv = 0x800C8950;
__dt__Q23m2d13EmbedLayout_cFv = 0x800C89A0;
loadArc__Q23m2d13EmbedLayout_cFPCcb = 0x800C8CB0;
+ loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0x800C8FB0;
+ loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C90F0;
+ enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C92F0;
+ enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9380;
+ disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9500;
free__Q23m2d13EmbedLayout_cFv = 0x800C9930;
execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9560;
scheduleForDrawing__Q23m2d6Base_cFv = 0x80163850;
diff --git a/kamek_ntsc2.x b/kamek_ntsc2.x
index 042fe0c..f6d2727 100644
--- a/kamek_ntsc2.x
+++ b/kamek_ntsc2.x
@@ -5,6 +5,15 @@ OUTPUT_FORMAT ("binary")
}*/
SECTIONS {
+ GetSpecificPlayerActor = 0x8005F900;
+ TimeStopFlag = 0x80429CFA;
+ TimerBranch = 0x800E39C8;
+ MarioDescentRate = 0x8042B864;
+ MarioJumpArc = 0x802F561C;
+ MarioJumpMax = 0x8042B848;
+ MiniMarioJumpArc = 0x802F5664;
+ MarioSize = 0x8042B874;
+
_savefpr_14 = 0x802DCCA8;
_savefpr_15 = 0x802DCCAC;
_savefpr_16 = 0x802DCCB0;
@@ -180,6 +189,11 @@ SECTIONS {
__ct__Q23m2d13EmbedLayout_cFv = 0x800C8950;
__dt__Q23m2d13EmbedLayout_cFv = 0x800C89A0;
loadArc__Q23m2d13EmbedLayout_cFPCcb = 0x800C8CB0;
+ loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0x800C8FB0;
+ loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C90F0;
+ enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C92F0;
+ enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9380;
+ disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9500;
free__Q23m2d13EmbedLayout_cFv = 0x800C9930;
execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9560;
scheduleForDrawing__Q23m2d6Base_cFv = 0x80163850;
diff --git a/kamek_pal.x b/kamek_pal.x
index ddf407c..fad6640 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -189,6 +189,11 @@ SECTIONS {
__ct__Q23m2d13EmbedLayout_cFv = 0x800C89A0;
__dt__Q23m2d13EmbedLayout_cFv = 0x800C89F0;
loadArc__Q23m2d13EmbedLayout_cFPCcb = 0x800C8D00;
+ loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0x800C90A0;
+ loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C91E0;
+ enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C93E0;
+ enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9470;
+ disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C95F0;
free__Q23m2d13EmbedLayout_cFv = 0x800C9A20;
execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9650;
scheduleForDrawing__Q23m2d6Base_cFv = 0x80163990;
diff --git a/kamek_pal2.x b/kamek_pal2.x
index d5f74d3..6c151ed 100644
--- a/kamek_pal2.x
+++ b/kamek_pal2.x
@@ -5,6 +5,15 @@ OUTPUT_FORMAT ("binary")
}*/
SECTIONS {
+ GetSpecificPlayerActor = 0xDEADBEEF;
+ TimeStopFlag = 0xDEADBEEF;
+ TimerBranch = 0xDEADBEEF;
+ MarioDescentRate = 0xDEADBEEF;
+ MarioJumpArc = 0xDEADBEEF;
+ MarioJumpMax = 0xDEADBEEF;
+ MiniMarioJumpArc = 0xDEADBEEF;
+ MarioSize = 0xDEADBEEF;
+
_savefpr_14 = 0xDEADBEEF;
_savefpr_15 = 0xDEADBEEF;
_savefpr_16 = 0xDEADBEEF;
@@ -180,6 +189,11 @@ SECTIONS {
__ct__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
__dt__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
loadArc__Q23m2d13EmbedLayout_cFPCcb = 0xDEADBEEF;
+ loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0xDEADBEEF;
+ loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0xDEADBEEF;
+ enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0xDEADBEEF;
+ enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0xDEADBEEF;
+ disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
free__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
execAnimations__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
scheduleForDrawing__Q23m2d6Base_cFv = 0xDEADBEEF;
diff --git a/src/wm_hud.cpp b/src/wm_hud.cpp
index 62ebb99..46efd54 100644
--- a/src/wm_hud.cpp
+++ b/src/wm_hud.cpp
@@ -27,9 +27,21 @@ int dWMHud_c::onCreate() {
if (!gotFile)
return false;
- layout.build("banner.brlyt");
-
- layout.findTextBoxByName("T_area_01")->AllocStringBuffer(100);
+ static const char *brlanNames[3] = {"maphud_hitbutton.brlan", "maphud_in.brlan", "maphud_out.brlan"};
+ static const char *groupNames[4] = {"B01_Button", "B02_Button", "A00_Window", "A00_Window"};
+
+ OSReport("Going to build\n");
+ bool output = layout.build("maphud.brlyt");
+ OSReport("Returned %d\n", output);
+ layout.loadAnimations(brlanNames, 3);
+ OSReport("Animations loaded\n");
+ layout.loadGroups(groupNames, (int[4]){0, 0, 1, 2}, 4);
+ OSReport("Groups loaded\n");
+ layout.disableAllAnimations();
+ OSReport("Animations disabled\n");
+ layout.enableNonLoopAnim(2);
+
+ //layout.findTextBoxByName("T_area_01")->AllocStringBuffer(100);
layoutLoaded = true;
}