Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/DFHack/df-structures
Browse files Browse the repository at this point in the history
  • Loading branch information
@lethosor
lethosor committed Dec 19, 2015
2 parents 3cf3123 + 1887ade commit 4ad540b
Showing 1 changed file with 70 additions and 70 deletions.
140 changes: 70 additions & 70 deletions symbols.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2066,41 +2066,41 @@

.data

<global-address name='cursor'/>
<global-address name='selection_rect'/>
<global-address name='cursor' value='0xfb81d0'/>
<global-address name='selection_rect' value='0xfb81dc'/>

<global-address name='gamemode'/>
<global-address name='gametype'/>
<global-address name='gamemode' value='0xfb81f4'/>
<global-address name='gametype' value='0xfb81f8'/>

<global-address name='ui_menu_width'/>
<global-address name='ui_area_map_width'/>
<global-address name='ui_menu_width' value='0xfb82a8'/>
<global-address name='ui_area_map_width' value='0xfb82a9'/>

.bss compound - THAT IS, NOT SIMPLE INTEGER VARIABLES!

<global-address name='created_item_type'/>
<global-address name='created_item_subtype'/>
<global-address name='created_item_mattype'/>
<global-address name='created_item_matindex'/>
<global-address name='created_item_count'/>
<global-address name='map_renderer'/>
<global-address name='d_init'/>
<global-address name='enabler'/>
<global-address name='flows'/>
<global-address name='gps'/>
<global-address name='gview'/>
<global-address name='init'/>
<global-address name='texture'/>
<global-address name='timed_events'/>
<global-address name='ui'/>
<global-address name='ui_advmode'/>
<global-address name='ui_build_selector'/>
<global-address name='ui_building_assign_type'/>
<global-address name='ui_building_assign_is_marked'/>
<global-address name='ui_building_assign_units'/>
<global-address name='ui_building_assign_items'/>
<global-address name='ui_look_list'/>
<global-address name='ui_sidebar_menus'/>
<global-address name='world'/>
<global-address name='created_item_type' value='0x1B35FF0'/>
<global-address name='created_item_subtype' value='0x1DAF1EC'/>
<global-address name='created_item_mattype' value='0x1D95710'/>
<global-address name='created_item_matindex' value='0x1973C2C'/>
<global-address name='created_item_count' value='0x1973BFC'/>
<global-address name='map_renderer' value='0x1D990F0'/>
<global-address name='d_init' value='0x1d95048'/>
<global-address name='enabler' value='0x1973958'/>
<global-address name='flows' value='0x1D990E0'/>
<global-address name='gps' value='0xfb8728'/>
<global-address name='gview' value='0x197b638'/>
<global-address name='init' value='0x1d98058'/>
<global-address name='texture' value='0x1D98024'/>
<global-address name='timed_events' value='0x1973C0C'/>
<global-address name='ui' value='0x1973c60'/>
<global-address name='ui_advmode' value='0x1DAB270'/>
<global-address name='ui_build_selector' value='0x1d97068'/>
<global-address name='ui_building_assign_type' value='0x1DAF1FC'/>
<global-address name='ui_building_assign_is_marked' value='0x1973C4C'/>
<global-address name='ui_building_assign_units' value='0x1B36020'/>
<global-address name='ui_building_assign_items' value='0x1973C3C'/>
<global-address name='ui_look_list' value='0x1DAF1DC'/>
<global-address name='ui_sidebar_menus' value='0x1d95720'/>
<global-address name='world' value='0x1b36030'/>

generated cglobals

Expand All @@ -2110,46 +2110,46 @@

.bss primitive

<global-address name='announcements'/>

<global-address name='cur_year'/>
<global-address name='cur_year_tick'/>
<global-address name='cur_year_tick_advmode'/>
<global-address name='cur_season'/>
<global-address name='cur_season_tick'/>

<global-address name='current_weather'/>

<global-address name='pause_state'/>
<global-address name='process_dig'/>
<global-address name='process_jobs'/>

<global-address name='ui_building_in_assign'/>
<global-address name='ui_building_in_resize'/>
<global-address name='ui_building_item_cursor'/>
<global-address name='ui_look_cursor'/>
<global-address name='ui_selected_unit'/>
<global-address name='ui_unit_view_mode'/>
<global-address name='ui_workshop_in_add'/>
<global-address name='ui_workshop_job_cursor'/>

<global-address name='window_x'/>
<global-address name='window_y'/>
<global-address name='window_z'/>

<global-address name='debug_nopause'/>
<global-address name='debug_nomoods'/>
<global-address name='debug_combat'/>
<global-address name='debug_wildlife'/>
<global-address name='debug_nodrink'/>
<global-address name='debug_noeat'/>
<global-address name='debug_nosleep'/>
<global-address name='debug_showambush'/>
<global-address name='debug_fastmining'/>
<global-address name='debug_noberserk'/>
<global-address name='debug_turbospeed'/>

<global-address name='save_on_exit'/>
<global-address name='announcements' value='0x1d951d8'/>

<global-address name='cur_year' value='0x137c374'/>
<global-address name='cur_year_tick' value='0x134A218'/>
<global-address name='cur_year_tick_advmode' value='0x129d334'/>
<global-address name='cur_season' value='0x129d33A'/>
<global-address name='cur_season_tick' value='0x129D214'/>

<global-address name='current_weather' value='0x19718BC'/>

<global-address name='pause_state' value='0x19718e7'/>
<global-address name='process_dig' value='0x19718e0'/>
<global-address name='process_jobs' value='0x19718e1'/>

<global-address name='ui_building_in_assign' value='0x19718e4'/>
<global-address name='ui_building_in_resize' value='0x19718e3'/>
<global-address name='ui_building_item_cursor' value='0x137c370'/>
<global-address name='ui_look_cursor' value='0x1363c50'/>
<global-address name='ui_selected_unit' value='0x137753c'/>
<global-address name='ui_unit_view_mode' value='0x134a100'/>
<global-address name='ui_workshop_in_add' value='0x1335a3a'/>
<global-address name='ui_workshop_job_cursor' value='0x19718b8'/>

<global-address name='window_x' value='0x1335a34'/>
<global-address name='window_y' value='0x1363c5c'/>
<global-address name='window_z' value='0x1363c28'/>

<global-address name='debug_nopause' value='0x19718F7'/>
<global-address name='debug_nomoods' value='0x19718F8'/>
<global-address name='debug_combat' value='0x19718F9'/>
<global-address name='debug_wildlife' value='0x19718FA'/>
<global-address name='debug_nodrink' value='0x19718FB'/>
<global-address name='debug_noeat' value='0x19718FC'/>
<global-address name='debug_nosleep' value='0x19718FD'/>
<global-address name='debug_showambush' value='0x19718FE'/>
<global-address name='debug_fastmining' value='0x19718FF'/>
<global-address name='debug_noberserk' value='0x1971900'/>
<global-address name='debug_turbospeed' value='0x1971901'/>

<global-address name='save_on_exit' value='0x19718E2'/>

code

Expand Down

0 comments on commit 4ad540b

Please sign in to comment.