diff options
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 181 |
1 files changed, 96 insertions, 85 deletions
@@ -1405,54 +1405,52 @@ wWindowStackSize:: db ; cf78 ds 8 -; menu data header -wMenuDataHeader:: ; cf81 +; menu header +wMenuHeader:: ; cf81 wMenuFlags:: db wMenuBorderTopCoord:: db wMenuBorderLeftCoord:: db wMenuBorderBottomCoord:: db wMenuBorderRightCoord:: db -wMenuData2Pointer:: dw +wMenuDataPointer:: dw wMenuCursorBuffer:: dw wMenuDataBank:: db ds 6 -wMenuDataHeaderEnd:: +wMenuHeaderEnd:: -wMenuData2:: -; MenuData2 - -wMenuData2Flags:: db ; cf91 +wMenuData:: +wMenuDataFlags:: db ; cf91 UNION ; cf92 ; Vertical Menu/DoNthMenu/SetUpMenu -wMenuData2Items:: db ; cf92 -wMenuData2IndicesPointer:: dw ; cf94 -wMenuData2DisplayFunctionPointer:: dw ; cf96 -wMenuData2PointerTableAddr:: dw ; cf97 +wMenuDataItems:: db ; cf92 +wMenuDataIndicesPointer:: dw ; cf94 +wMenuDataDisplayFunctionPointer:: dw ; cf96 +wMenuDataPointerTableAddr:: dw ; cf97 NEXTU ; cf92 ; 2D Menu -wMenuData2_2DMenuDimensions:: db ; cf92 -wMenuData2_2DMenuSpacing:: db ; cf93 -wMenuData2_2DMenuItemStringsBank:: db ; cf94 -wMenuData2_2DMenuItemStringsAddr:: dw ; cf96 -wMenuData2_2DMenuFunctionBank:: db ; cf97 -wMenuData2_2DMenuFunctionAddr:: dw ; cf98 +wMenuData_2DMenuDimensions:: db ; cf92 +wMenuData_2DMenuSpacing:: db ; cf93 +wMenuData_2DMenuItemStringsBank:: db ; cf94 +wMenuData_2DMenuItemStringsAddr:: dw ; cf96 +wMenuData_2DMenuFunctionBank:: db ; cf97 +wMenuData_2DMenuFunctionAddr:: dw ; cf98 NEXTU ; cf92 ; Scrolling Menu -wMenuData2_ScrollingMenuHeight:: db ; cf92 -wMenuData2_ScrollingMenuWidth:: db ; cf93 -wMenuData2_ScrollingMenuSpacing:: db ; cf94 -wMenuData2_ItemsPointerBank:: db ; cf95 -wMenuData2_ItemsPointerAddr:: dw ; cf97 -wMenuData2_ScrollingMenuFunction1:: ds 3 ; cf98 -wMenuData2_ScrollingMenuFunction2:: ds 3 ; cf9b -wMenuData2_ScrollingMenuFunction3:: ds 3 ; cf9e +wMenuData_ScrollingMenuHeight:: db ; cf92 +wMenuData_ScrollingMenuWidth:: db ; cf93 +wMenuData_ScrollingMenuSpacing:: db ; cf94 +wMenuData_ItemsPointerBank:: db ; cf95 +wMenuData_ItemsPointerAddr:: dw ; cf97 +wMenuData_ScrollingMenuFunction1:: ds 3 ; cf98 +wMenuData_ScrollingMenuFunction2:: ds 3 ; cf9b +wMenuData_ScrollingMenuFunction3:: ds 3 ; cf9e ENDU ; cfa1 -wMenuData2End:: +wMenuDataEnd:: -wMenuData3:: +w2DMenuData:: w2DMenuCursorInitY:: db ; cfa1 w2DMenuCursorInitX:: db ; cfa2 w2DMenuNumRows:: db ; cfa3 @@ -1470,7 +1468,7 @@ w2DMenuFlags1:: ; cfa5 w2DMenuFlags2:: db ; cfa6 w2DMenuCursorOffsets:: db ; cfa7 wMenuJoypadFilter:: db ; cfa8 -wMenuData3End:: +w2DMenuDataEnd:: wMenuCursorY:: db ; cfa9 wMenuCursorX:: db ; cfaa @@ -1491,7 +1489,8 @@ wFarCallBCBuffer:: dw ; cfb9 wcfbb:: db wGameTimerPause:: ; cfbc -; bit 0 +; bit 0: game timer paused +; bit 7: something mobile db ds 1 @@ -2285,7 +2284,9 @@ wXYComparePointer:: dw ; d453 wBattleScriptFlags:: dw ; d459 wPlayerSpriteSetupFlags:: ; d45b ; bit 7: if set, cancel PlayerAction +; bit 6: RefreshMapSprites doesn't reload player sprite ; bit 5: if set, set facing according to bits 0-1 +; bit 2: female player has been transformed into male ; bits 0-1: direction facing db wMapReentryScriptQueueFlag:: db ; d45c MemScriptFlag @@ -2338,7 +2339,9 @@ StartMinute:: db ; d4b8 StartSecond:: db ; d4b9 wRTC:: ds 8 ; d4ba -wDST:: db ; d4c2 +wDST:: ; d4c2 +; bit 7: dst + db GameTime:: GameTimeCap:: db ; d4c3 @@ -2360,19 +2363,19 @@ wFollowerMovementQueueLength:: db wFollowMovementQueue:: ds 5 ObjectStructs:: ; d4d6 - object_struct Player - object_struct Object1 - object_struct Object2 - object_struct Object3 - object_struct Object4 - object_struct Object5 - object_struct Object6 - object_struct Object7 - object_struct Object8 - object_struct Object9 - object_struct Object10 - object_struct Object11 - object_struct Object12 +PlayerStruct:: object_struct Player +Object1Struct:: object_struct Object1 +Object2Struct:: object_struct Object2 +Object3Struct:: object_struct Object3 +Object4Struct:: object_struct Object4 +Object5Struct:: object_struct Object5 +Object6Struct:: object_struct Object6 +Object7Struct:: object_struct Object7 +Object8Struct:: object_struct Object8 +Object9Struct:: object_struct Object9 +Object10Struct:: object_struct Object10 +Object11Struct:: object_struct Object11 +Object12Struct:: object_struct Object12 ObjectStructsEnd:: ; d6de wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE @@ -2380,22 +2383,22 @@ wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE ds 40 MapObjects:: ; d71e - map_object Player - map_object Map1 - map_object Map2 - map_object Map3 - map_object Map4 - map_object Map5 - map_object Map6 - map_object Map7 - map_object Map8 - map_object Map9 - map_object Map10 - map_object Map11 - map_object Map12 - map_object Map13 - map_object Map14 - map_object Map15 +PlayerObject:: map_object Player +Map1Object:: map_object Map1 +Map2Object:: map_object Map2 +Map3Object:: map_object Map3 +Map4Object:: map_object Map4 +Map5Object:: map_object Map5 +Map6Object:: map_object Map6 +Map7Object:: map_object Map7 +Map8Object:: map_object Map8 +Map9Object:: map_object Map9 +Map10Object:: map_object Map10 +Map11Object:: map_object Map11 +Map12Object:: map_object Map12 +Map13Object:: map_object Map13 +Map14Object:: map_object Map14 +Map15Object:: map_object Map15 MapObjectsEnd:: wObjectMasks:: ds NUM_OBJECTS ; d81e @@ -2414,30 +2417,36 @@ CurTimeOfDay:: db ; d848 wSecretID:: dw wStatusFlags:: ; d84c - ; 0 - pokedex - ; 1 - unown dex - ; 2 - - ; 3 - pokerus - ; 4 - rocket signal - ; 5 - wild encounters on/off - ; 6 - hall of fame - ; 7 - bug contest on +; bit 0: pokedex +; bit 1: unown dex +; bit 2: flash +; bit 3: caught pokerus +; bit 4: rocket signal +; bit 5: wild encounters on/off +; bit 6: hall of fame +; bit 7: bug contest on db wStatusFlags2:: ; d84d - ; 0 - rockets - ; 1 - - ; 2 - bug contest timer - ; 3 - - ; 4 - bike shop call - ; 5 - pokerus - ; 6 - berry juice? - ; 7 - rockets in mahogany +; bit 0: rockets +; bit 1: safari game (unused) +; bit 2: bug contest timer +; bit 3: unused +; bit 4: bike shop call +; bit 5: can use sweet scent +; bit 6: reached goldenrod +; bit 7: rockets in mahogany db Money:: ds 3 ; d84e wMomsMoney:: ds 3 ; d851 -wMomSavingMoney:: db ; d854 + +wMomSavingMoney:: ; d854 +; bit 0: saving some money +; bit 1: saving half money (unused) +; bit 2: saving all money (unused) +; bit 7: active + db Coins:: dw ; d855 @@ -2513,7 +2522,7 @@ wHallOfFameSceneID:: db ; d984 wRoute27SceneID:: db ; d985 wNewBarkTownSceneID:: db ; d986 wElmsLabSceneID:: db ; d987 -wKrissHouse1FSceneID:: db ; d988 +wPlayersHouse1FSceneID:: db ; d988 wRoute29SceneID:: db ; d989 wCherrygroveCitySceneID:: db ; d98a wMrPokemonsHouseSceneID:: db ; d98b @@ -2528,7 +2537,7 @@ wGoldenrodPokecenter1FSceneID:: db ; d993 wOlivineCitySceneID:: db ; d994 wRoute34SceneID:: db ; d995 wRoute34IlexForestGateSceneID:: db ; d996 -wEcruteakHouseSceneID:: db ; d997 +wEcruteakTinTowerEntranceSceneID:: db ; d997 wWiseTriosRoomSceneID:: db ; d998 wEcruteakPokecenter1FSceneID:: db ; d999 wEcruteakGymSceneID:: db ; d99a @@ -2618,7 +2627,9 @@ wCurBox:: db ; db72 ; 8 chars + $50 wBoxNames:: ds BOX_NAME_LENGTH * NUM_BOXES ; db75 -wCelebiEvent:: db +wCelebiEvent:: ; dbf3 +; bit 2: forest is restless + db ds 1 @@ -2627,8 +2638,7 @@ wBikeFlags:: ; dbf5 ; bit 1: always on bike ; bit 2: downhill db - - ds 1 + ds 1 ; also cleared by ResetBikeFlags wCurrMapSceneScriptPointer:: dw ; dbf7 @@ -2713,7 +2723,8 @@ wPhoneList:: ds CONTACT_LIST_SIZE ; dc7c ; dc86 ds 23 -wLuckyNumberShowFlag:: dw ; dc9d +wLuckyNumberShowFlag:: db ; dc9d + ds 1 wLuckyIDNumber:: dw ; dc9f wRepelEffect:: db ; If a Repel is in use, it contains the nr of steps it's still active @@ -2787,8 +2798,8 @@ wFirstUnownSeen:: db wDayCareMan:: ; def5 ; bit 7: active -; bit 6: monsters are compatible -; bit 5: egg ready +; bit 6: egg ready +; bit 5: monsters are compatible ; bit 0: monster 1 in day-care db |