decompile option menu and begin decompiling pokedex (#58)

* start decompiling pokedex

* fix up this darn struct

* decompile most of the option menu code

* decompile more code

* finish up with option menu

* minor cleanup

* fix some pokedex functions

* remove disassembly files

* actually remove disassembly files

* more decompilation

* decompile 2 more functions

* minor cleanup

* Update start_menu.c with CB2_InitPokedex

1 files changed, 15 insertions, 15 deletions

diff --git a/include/gba/types.h b/include/gba/types.h
index 740c72d92..589d27b58 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -36,21 +36,21 @@ struct PlttData
 
 struct OamData
 {
-    u32 y:8;
-    u32 affineMode:2;
-    u32 objMode:2;
-    u32 mosaic:1;
-    u32 bpp:1;
-    u32 shape:2;
-
-    u32 x:9;
-    u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
-    u32 size:2;
-
-    u16 tileNum:10;
-    u16 priority:2;
-    u16 paletteNum:4;
-    u16 affineParam;
+    /*0x00*/ u32 y:8;
+    /*0x01*/ u32 affineMode:2;
+             u32 objMode:2;
+             u32 mosaic:1;
+             u32 bpp:1;
+             u32 shape:2;
+
+    /*0x02*/ u32 x:9;
+             u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
+             u32 size:2;
+
+    /*0x04*/ u16 tileNum:10;
+             u16 priority:2;
+             u16 paletteNum:4;
+    /*0x06*/ u16 affineParam;
 };
 
 #define ST_OAM_OBJ_NORMAL 0