diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-24 16:48:16 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-24 16:48:16 -0500 |
| commit | c0884789752ad8d6b4d7d61ada19f28c7790fc9e (patch) | |
| tree | 9034fefc31c43e1b76fbe49cf67e612d43e61354 | |
| parent | 3764377091ad23145fbd92c769b78ce2f296900f (diff) | |
| parent | fbf73be7ef8301803fce6eeb1e4c355a113210e2 (diff) | |
| download | kamek-c0884789752ad8d6b4d7d61ada19f28c7790fc9e.tar.gz kamek-c0884789752ad8d6b4d7d61ada19f28c7790fc9e.zip | |
mmmerge
| -rwxr-xr-x | include/game.h | 40 | ||||
| -rw-r--r-- | kamek_pal.x | 2 |
2 files changed, 42 insertions, 0 deletions
diff --git a/include/game.h b/include/game.h index 14d61ad..efe5fa6 100755 --- a/include/game.h +++ b/include/game.h @@ -2871,5 +2871,45 @@ inline int GetAreaNum() { +class ClassWithCameraInfo {
+ public:
+ ClassWithCameraInfo();
+ virtual ~ClassWithCameraInfo();
+
+ // Not quite sure what this is for, stores bitflags for each tile or something?
+ void initBitfields();
+ void deinitBitfields();
+ void deleteOneBitfield(int area, int layer);
+
+ u16 getBitfieldPart(int area, u16 entryIndex, int layer);
+ void setBitfieldPart(int area, u16 entryIndex, int layer, u16 value);
+
+
+ void setSomeInitialVars();
+
+ void s_80082180(); // sets initedTo2 to 0, 1 or 2 depending on the X position
+ void s_800821E0(); // same thing for field_81
+
+ float getEffectiveScreenLeft(); // takes wrap into account
+
+
+ u16 *tileBitfields[12];
+ float _34, screenLeft, screenTop, screenWidth, screenHeight;
+ float screenCentreX, screenCentreY;
+
+ float _50, _54, _58, _5C, _60, _64, _68, _6C, _70, _74;
+ float xOffset, yOffsetForTagScroll;
+
+ u8 initedTo2, _81;
+ u32 _84, _88, _8C, _90;
+ void *bgHeap;
+
+
+ static ClassWithCameraInfo *instance;
+
+ // That is all
+};
+
+
#endif
diff --git a/kamek_pal.x b/kamek_pal.x index 866bee2..9839dec 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -19,6 +19,8 @@ SECTIONS { sAllocatorFunc__FrmHeap = 0x8042E5B0; GetActivePlayerCount = 0x8005FFB0; + getEffectiveScreenLeft__19ClassWithCameraInfoFv = 0x80082240; + instance__19ClassWithCameraInfo = 0x8042A0E0; /* Back to other shit I didn't want to scroll for */ |