From 90ffd55299ca5b0bea9fd7e744c2fb587eff9e23 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 22 Oct 2018 22:50:13 -0600 Subject: [PATCH 1/3] Update patch files --- ASM/build/asm_symbols.txt | 2216 +++--- ASM/build/bundle.o | Bin 11068 -> 11068 bytes ASM/build/c_symbols.txt | 134 +- data/rom_patch.txt | 13264 ++++++++++++++++++------------------ data/symbols.json | 34 +- version.py | 2 +- 6 files changed, 7824 insertions(+), 7826 deletions(-) diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt index d5b9f642d..6701a0219 100644 --- a/ASM/build/asm_symbols.txt +++ b/ASM/build/asm_symbols.txt @@ -1,1109 +1,1109 @@ -00000000 0 -00000000 .byt:4000000 -00000010 .dbl:0008 -00000010 ITEM_TABLE_ROW_SIZE -000005B4 Shop_Item_Save_Offset -0000D260 .dbl:0010 -0000D270 .dbl:0010 -0089E800 .byt:0400 -00B529A0 skip_GS_BGS_text -00BAF750 .byt:0048 -00D74990 skip_steal_tunic -00D7E178 @@not_in_ranch -00D7E18C @@return -00D7E18C return_from_the_other_function -00D7E3AC @@hyrule_check -00D7E3CC @@lon_lon_check -00D7E3F4 @@return_false -00D7E7A4 @@set_ev0 -00D7E7B8 set_ev1 -00D7E8A8 @@unsafe -00D7E8C0 @@safe -00D7E8D4 @@not_hyrule -00D7E920 ev0_return -00DB13D3 .byt:0001 -00DF264F .byt:0001 -00E2F093 .byt:0001 -00EBB8B0 @Deku_Check_True -00EBB8C0 @Deku_Check_False -00EC68D0 .byt:0014 -00EC69C0 .byt:0014 -00EC9CE7 .byt:0001 -8011A5D0 SAVE_CONTEXT -801C84A0 GLOBAL_CONTEXT -801D8C00 SUBSCREEN_CONTEXT -801DAA30 PLAYER_ACTOR -803A9E7E GET_ITEMTABLE -80400000 init -80400050 DebugOutput -80401000 .byt:0800 -80401000 ITEM_OVERRIDES -80401800 .byt:0400 -80401800 INITIAL_SAVE_DATA -80401C00 .byt:0001 -80401C00 PLAYER_ID -80401C01 .byt:0001 -80401C01 COOP_GET_ITEM -80401C02 .byt:0001 -80401C02 PLAYER_NAME_ID -80401C03 .byt:0100 -80401C03 PLAYER_NAMES -80401D03 .byt:0001 -80401D03 LIGHT_ARROW_ITEM -80401D04 .byt:0001 -80401D04 FAIRY_OCARINA_ITEM -80401D05 .byt:0001 -80401D05 FAIRY_ITEMS -80401D06 .byt:0001 -80401D07 .byt:0001 -80401D08 .byt:0001 -80401D09 .byt:0001 -80401D0A .byt:0001 -80401D0C .byt:02F4 -80402000 .dbl:0008 -80402000 PLAYER_OVERRIDE_DATA -80402008 .dbl:0010 -80402008 EXTENDED_ITEM_DATA -80402018 .byt:0001 -80402018 PENDING_SPECIAL_ITEM -80402019 .byt:0001 -8040201A .byt:0001 -8040201B .byt:0001 -8040201B PENDING_SPECIAL_ITEM_END -8040201C .dbl:0004 -8040201C TIME_TRAVEL_SAVED_EQUIPS -80402020 .dbl:0004 -80402024 .wrd:0002 -80402026 .wrd:0002 -80402028 .byt:0028 -80402050 .byt:0001 -80402050 ITEM_TABLE -80402051 .byt:0001 -80402052 .byt:0001 -80402053 .byt:0001 -80402054 .wrd:0002 -80402056 .byt:0001 -80402057 .byt:0001 -80402058 .dbl:0004 -8040205C .dbl:0004 -80402060 .byt:0001 -80402061 .byt:0001 -80402062 .byt:0001 -80402063 .byt:0001 -80402064 .wrd:0002 -80402066 .byt:0001 -80402067 .byt:0001 -80402068 .dbl:0004 -8040206C .dbl:0004 -80402070 .byt:0001 -80402071 .byt:0001 -80402072 .byt:0001 -80402073 .byt:0001 -80402074 .wrd:0002 -80402076 .byt:0001 -80402077 .byt:0001 -80402078 .dbl:0004 -8040207C .dbl:0004 -80402080 .byt:0001 -80402081 .byt:0001 -80402082 .byt:0001 -80402083 .byt:0001 -80402084 .wrd:0002 -80402086 .byt:0001 -80402087 .byt:0001 -80402088 .dbl:0004 -8040208C .dbl:0004 -80402090 .byt:0001 -80402091 .byt:0001 -80402092 .byt:0001 -80402093 .byt:0001 -80402094 .wrd:0002 -80402096 .byt:0001 -80402097 .byt:0001 -80402098 .dbl:0004 -8040209C .dbl:0004 -804020A0 .byt:0001 -804020A1 .byt:0001 -804020A2 .byt:0001 -804020A3 .byt:0001 -804020A4 .wrd:0002 -804020A6 .byt:0001 -804020A7 .byt:0001 -804020A8 .dbl:0004 -804020AC .dbl:0004 -804020B0 .byt:0001 -804020B1 .byt:0001 -804020B2 .byt:0001 -804020B3 .byt:0001 -804020B4 .wrd:0002 -804020B6 .byt:0001 -804020B7 .byt:0001 -804020B8 .dbl:0004 -804020BC .dbl:0004 -804020C0 .byt:0001 -804020C1 .byt:0001 -804020C2 .byt:0001 -804020C3 .byt:0001 -804020C4 .wrd:0002 -804020C6 .byt:0001 -804020C7 .byt:0001 -804020C8 .dbl:0004 -804020CC .dbl:0004 -804020D0 .byt:0001 -804020D1 .byt:0001 -804020D2 .byt:0001 -804020D3 .byt:0001 -804020D4 .wrd:0002 -804020D6 .byt:0001 -804020D7 .byt:0001 -804020D8 .dbl:0004 -804020DC .dbl:0004 -804020E0 .byt:0001 -804020E1 .byt:0001 -804020E2 .byt:0001 -804020E3 .byt:0001 -804020E4 .wrd:0002 -804020E6 .byt:0001 -804020E7 .byt:0001 -804020E8 .dbl:0004 -804020EC .dbl:0004 -804020F0 .byt:0001 -804020F1 .byt:0001 -804020F2 .byt:0001 -804020F3 .byt:0001 -804020F4 .wrd:0002 -804020F6 .byt:0001 -804020F7 .byt:0001 -804020F8 .dbl:0004 -804020FC .dbl:0004 -80402100 .byt:0001 -80402101 .byt:0001 -80402102 .byt:0001 -80402103 .byt:0001 -80402104 .wrd:0002 -80402106 .byt:0001 -80402107 .byt:0001 -80402108 .dbl:0004 -8040210C .dbl:0004 -80402110 .byt:0001 -80402111 .byt:0001 -80402112 .byt:0001 -80402113 .byt:0001 -80402114 .wrd:0002 -80402116 .byt:0001 -80402117 .byt:0001 -80402118 .dbl:0004 -8040211C .dbl:0004 -80402120 .byt:0001 -80402121 .byt:0001 -80402122 .byt:0001 -80402123 .byt:0001 -80402124 .wrd:0002 -80402126 .byt:0001 -80402127 .byt:0001 -80402128 .dbl:0004 -8040212C .dbl:0004 -80402130 .byt:0001 -80402131 .byt:0001 -80402132 .byt:0001 -80402133 .byt:0001 -80402134 .wrd:0002 -80402136 .byt:0001 -80402137 .byt:0001 -80402138 .dbl:0004 -8040213C .dbl:0004 -80402140 .byt:0001 -80402141 .byt:0001 -80402142 .byt:0001 -80402143 .byt:0001 -80402144 .wrd:0002 -80402146 .byt:0001 -80402147 .byt:0001 -80402148 .dbl:0004 -8040214C .dbl:0004 -80402150 .byt:0001 -80402151 .byt:0001 -80402152 .byt:0001 -80402153 .byt:0001 -80402154 .wrd:0002 -80402156 .byt:0001 -80402157 .byt:0001 -80402158 .dbl:0004 -8040215C .dbl:0004 -80402160 .byt:0001 -80402161 .byt:0001 -80402162 .byt:0001 -80402163 .byt:0001 -80402164 .wrd:0002 -80402166 .byt:0001 -80402167 .byt:0001 -80402168 .dbl:0004 -8040216C .dbl:0004 -80402170 .byt:0001 -80402171 .byt:0001 -80402172 .byt:0001 -80402173 .byt:0001 -80402174 .wrd:0002 -80402176 .byt:0001 -80402177 .byt:0001 -80402178 .dbl:0004 -8040217C .dbl:0004 -80402180 .byt:0001 -80402181 .byt:0001 -80402182 .byt:0001 -80402183 .byt:0001 -80402184 .wrd:0002 -80402186 .byt:0001 -80402187 .byt:0001 -80402188 .dbl:0004 -8040218C .dbl:0004 -80402190 .byt:0001 -80402191 .byt:0001 -80402192 .byt:0001 -80402193 .byt:0001 -80402194 .wrd:0002 -80402196 .byt:0001 -80402197 .byt:0001 -80402198 .dbl:0004 -8040219C .dbl:0004 -804021A0 .byt:0001 -804021A1 .byt:0001 -804021A2 .byt:0001 -804021A3 .byt:0001 -804021A4 .wrd:0002 -804021A6 .byt:0001 -804021A7 .byt:0001 -804021A8 .dbl:0004 -804021AC .dbl:0004 -804021B0 .byt:0001 -804021B1 .byt:0001 -804021B2 .byt:0001 -804021B3 .byt:0001 -804021B4 .wrd:0002 -804021B6 .byt:0001 -804021B7 .byt:0001 -804021B8 .dbl:0004 -804021BC .dbl:0004 -804021C0 .byt:0001 -804021C1 .byt:0001 -804021C2 .byt:0001 -804021C3 .byt:0001 -804021C4 .wrd:0002 -804021C6 .byt:0001 -804021C7 .byt:0001 -804021C8 .dbl:0004 -804021CC .dbl:0004 -804021D0 .byt:0001 -804021D1 .byt:0001 -804021D2 .byt:0001 -804021D3 .byt:0001 -804021D4 .wrd:0002 -804021D6 .byt:0001 -804021D7 .byt:0001 -804021D8 .dbl:0004 -804021DC .dbl:0004 -804021E0 .byt:0001 -804021E1 .byt:0001 -804021E2 .byt:0001 -804021E3 .byt:0001 -804021E4 .wrd:0002 -804021E6 .byt:0001 -804021E7 .byt:0001 -804021E8 .dbl:0004 -804021EC .dbl:0004 -804021F0 .byt:0001 -804021F1 .byt:0001 -804021F2 .byt:0001 -804021F3 .byt:0001 -804021F4 .wrd:0002 -804021F6 .byt:0001 -804021F7 .byt:0001 -804021F8 .dbl:0004 -804021FC .dbl:0004 -80402200 .byt:0001 -80402201 .byt:0001 -80402202 .byt:0001 -80402203 .byt:0001 -80402204 .wrd:0002 -80402206 .byt:0001 -80402207 .byt:0001 -80402208 .dbl:0004 -8040220C .dbl:0004 -80402210 .byt:0001 -80402211 .byt:0001 -80402212 .byt:0001 -80402213 .byt:0001 -80402214 .wrd:0002 -80402216 .byt:0001 -80402217 .byt:0001 -80402218 .dbl:0004 -8040221C .dbl:0004 -80402220 .byt:0001 -80402221 .byt:0001 -80402222 .byt:0001 -80402223 .byt:0001 -80402224 .wrd:0002 -80402226 .byt:0001 -80402227 .byt:0001 -80402228 .dbl:0004 -8040222C .dbl:0004 -80402230 .byt:0001 -80402231 .byt:0001 -80402232 .byt:0001 -80402233 .byt:0001 -80402234 .wrd:0002 -80402236 .byt:0001 -80402237 .byt:0001 -80402238 .dbl:0004 -8040223C .dbl:0004 -80402240 .byt:0001 -80402241 .byt:0001 -80402242 .byt:0001 -80402243 .byt:0001 -80402244 .wrd:0002 -80402246 .byt:0001 -80402247 .byt:0001 -80402248 .dbl:0004 -8040224C .dbl:0004 -80402250 .byt:0001 -80402251 .byt:0001 -80402252 .byt:0001 -80402253 .byt:0001 -80402254 .wrd:0002 -80402256 .byt:0001 -80402257 .byt:0001 -80402258 .dbl:0004 -8040225C .dbl:0004 -80402260 .byt:0001 -80402261 .byt:0001 -80402262 .byt:0001 -80402263 .byt:0001 -80402264 .wrd:0002 -80402266 .byt:0001 -80402267 .byt:0001 -80402268 .dbl:0004 -8040226C .dbl:0004 -80402270 .byt:0001 -80402271 .byt:0001 -80402272 .byt:0001 -80402273 .byt:0001 -80402274 .wrd:0002 -80402276 .byt:0001 -80402277 .byt:0001 -80402278 .dbl:0004 -8040227C .dbl:0004 -80402280 .byt:0001 -80402281 .byt:0001 -80402282 .byt:0001 -80402283 .byt:0001 -80402284 .wrd:0002 -80402286 .byt:0001 -80402287 .byt:0001 -80402288 .dbl:0004 -8040228C .dbl:0004 -80402290 .byt:0001 -80402291 .byt:0001 -80402292 .byt:0001 -80402293 .byt:0001 -80402294 .wrd:0002 -80402296 .byt:0001 -80402297 .byt:0001 -80402298 .dbl:0004 -8040229C .dbl:0004 -804022A0 .byt:0001 -804022A1 .byt:0001 -804022A2 .byt:0001 -804022A3 .byt:0001 -804022A4 .wrd:0002 -804022A6 .byt:0001 -804022A7 .byt:0001 -804022A8 .dbl:0004 -804022AC .dbl:0004 -804022B0 .byt:0001 -804022B1 .byt:0001 -804022B2 .byt:0001 -804022B3 .byt:0001 -804022B4 .wrd:0002 -804022B6 .byt:0001 -804022B7 .byt:0001 -804022B8 .dbl:0004 -804022BC .dbl:0004 -804022C0 .byt:0001 -804022C1 .byt:0001 -804022C2 .byt:0001 -804022C3 .byt:0001 -804022C4 .wrd:0002 -804022C6 .byt:0001 -804022C7 .byt:0001 -804022C8 .dbl:0004 -804022CC .dbl:0004 -804022D0 .byt:0001 -804022D1 .byt:0001 -804022D2 .byt:0001 -804022D3 .byt:0001 -804022D4 .wrd:0002 -804022D6 .byt:0001 -804022D7 .byt:0001 -804022D8 .dbl:0004 -804022DC .dbl:0004 -804022E0 .byt:0001 -804022E1 .byt:0001 -804022E2 .byt:0001 -804022E3 .byt:0001 -804022E4 .wrd:0002 -804022E6 .byt:0001 -804022E7 .byt:0001 -804022E8 .dbl:0004 -804022EC .dbl:0004 -804022F0 .byt:0001 -804022F1 .byt:0001 -804022F2 .byt:0001 -804022F3 .byt:0001 -804022F4 .wrd:0002 -804022F6 .byt:0001 -804022F7 .byt:0001 -804022F8 .dbl:0004 -804022FC .dbl:0004 -80402300 .byt:0001 -80402301 .byt:0001 -80402302 .byt:0001 -80402303 .byt:0001 -80402304 .wrd:0002 -80402306 .byt:0001 -80402307 .byt:0001 -80402308 .dbl:0004 -8040230C .dbl:0004 -80402310 .byt:0001 -80402311 .byt:0001 -80402312 .byt:0001 -80402313 .byt:0001 -80402314 .wrd:0002 -80402316 .byt:0001 -80402317 .byt:0001 -80402318 .dbl:0004 -8040231C .dbl:0004 -80402320 .byt:0001 -80402321 .byt:0001 -80402322 .byt:0001 -80402323 .byt:0001 -80402324 .wrd:0002 -80402326 .byt:0001 -80402327 .byt:0001 -80402328 .dbl:0004 -8040232C .dbl:0004 -80402330 .byt:0001 -80402331 .byt:0001 -80402332 .byt:0001 -80402333 .byt:0001 -80402334 .wrd:0002 -80402336 .byt:0001 -80402337 .byt:0001 -80402338 .dbl:0004 -8040233C .dbl:0004 -80402340 .byt:0001 -80402341 .byt:0001 -80402342 .byt:0001 -80402343 .byt:0001 -80402344 .wrd:0002 -80402346 .byt:0001 -80402347 .byt:0001 -80402348 .dbl:0004 -8040234C .dbl:0004 -80402350 .byt:0001 -80402351 .byt:0001 -80402352 .byt:0001 -80402353 .byt:0001 -80402354 .wrd:0002 -80402356 .byt:0001 -80402357 .byt:0001 -80402358 .dbl:0004 -8040235C .dbl:0004 -80402360 .byt:0001 -80402361 .byt:0001 -80402362 .byt:0001 -80402363 .byt:0001 -80402364 .wrd:0002 -80402366 .byt:0001 -80402367 .byt:0001 -80402368 .dbl:0004 -8040236C .dbl:0004 -80402370 .byt:0001 -80402371 .byt:0001 -80402372 .byt:0001 -80402373 .byt:0001 -80402374 .wrd:0002 -80402376 .byt:0001 -80402377 .byt:0001 -80402378 .dbl:0004 -8040237C .dbl:0004 -80402380 .byt:0001 -80402381 .byt:0001 -80402382 .byt:0001 -80402383 .byt:0001 -80402384 .wrd:0002 -80402386 .byt:0001 -80402387 .byt:0001 -80402388 .dbl:0004 -8040238C .dbl:0004 -80402390 .byt:0001 -80402391 .byt:0001 -80402392 .byt:0001 -80402393 .byt:0001 -80402394 .wrd:0002 -80402396 .byt:0001 -80402397 .byt:0001 -80402398 .dbl:0004 -8040239C .dbl:0004 -804023A0 .byt:0001 -804023A1 .byt:0001 -804023A2 .byt:0001 -804023A3 .byt:0001 -804023A4 .wrd:0002 -804023A6 .byt:0001 -804023A7 .byt:0001 -804023A8 .dbl:0004 -804023AC .dbl:0004 -804023B0 .byt:0001 -804023B1 .byt:0001 -804023B2 .byt:0001 -804023B3 .byt:0001 -804023B4 .wrd:0002 -804023B6 .byt:0001 -804023B7 .byt:0001 -804023B8 .dbl:0004 -804023BC .dbl:0004 -804023C0 .byt:0001 -804023C1 .byt:0001 -804023C2 .byt:0001 -804023C3 .byt:0001 -804023C4 .wrd:0002 -804023C6 .byt:0001 -804023C7 .byt:0001 -804023C8 .dbl:0004 -804023CC .dbl:0004 -804023D0 .byt:0001 -804023D1 .byt:0001 -804023D2 .byt:0001 -804023D3 .byt:0001 -804023D4 .wrd:0002 -804023D6 .byt:0001 -804023D7 .byt:0001 -804023D8 .dbl:0004 -804023DC .dbl:0004 -804023E0 .byt:0001 -804023E1 .byt:0001 -804023E2 .byt:0001 -804023E3 .byt:0001 -804023E4 .wrd:0002 -804023E6 .byt:0001 -804023E7 .byt:0001 -804023E8 .dbl:0004 -804023EC .dbl:0004 -804023F0 .byt:0001 -804023F1 .byt:0001 -804023F2 .byt:0001 -804023F3 .byt:0001 -804023F4 .wrd:0002 -804023F6 .byt:0001 -804023F7 .byt:0001 -804023F8 .dbl:0004 -804023FC .dbl:0004 -80402400 .byt:0001 -80402401 .byt:0001 -80402402 .byt:0001 -80402403 .byt:0001 -80402404 .wrd:0002 -80402406 .byt:0001 -80402407 .byt:0001 -80402408 .dbl:0004 -8040240C .dbl:0004 -80402410 .byt:0001 -80402411 .byt:0001 -80402412 .byt:0001 -80402413 .byt:0001 -80402414 .wrd:0002 -80402416 .byt:0001 -80402417 .byt:0001 -80402418 .dbl:0004 -8040241C .dbl:0004 -80402420 .byt:0001 -80402421 .byt:0001 -80402422 .byt:0001 -80402423 .byt:0001 -80402424 .wrd:0002 -80402426 .byt:0001 -80402427 .byt:0001 -80402428 .dbl:0004 -8040242C .dbl:0004 -80402430 .byt:0001 -80402431 .byt:0001 -80402432 .byt:0001 -80402433 .byt:0001 -80402434 .wrd:0002 -80402436 .byt:0001 -80402437 .byt:0001 -80402438 .dbl:0004 -8040243C .dbl:0004 -80402440 .byt:0001 -80402441 .byt:0001 -80402442 .byt:0001 -80402443 .byt:0001 -80402444 .wrd:0002 -80402446 .byt:0001 -80402447 .byt:0001 -80402448 .dbl:0004 -8040244C .dbl:0004 -80402450 .byt:0001 -80402451 .byt:0001 -80402452 .byt:0001 -80402453 .byt:0001 -80402454 .wrd:0002 -80402456 .byt:0001 -80402457 .byt:0001 -80402458 .dbl:0004 -8040245C .dbl:0004 -80402460 .byt:0001 -80402461 .byt:0001 -80402462 .byt:0001 -80402463 .byt:0001 -80402464 .wrd:0002 -80402466 .byt:0001 -80402467 .byt:0001 -80402468 .dbl:0004 -8040246C .dbl:0004 -80402470 .byt:0001 -80402471 .byt:0001 -80402472 .byt:0001 -80402473 .byt:0001 -80402474 .wrd:0002 -80402476 .byt:0001 -80402477 .byt:0001 -80402478 .dbl:0004 -8040247C .dbl:0004 -80402480 .byt:0001 -80402481 .byt:0001 -80402482 .byt:0001 -80402483 .byt:0001 -80402484 .wrd:0002 -80402486 .byt:0001 -80402487 .byt:0001 -80402488 .dbl:0004 -8040248C .dbl:0004 -80402490 .byt:0001 -80402491 .byt:0001 -80402492 .byt:0001 -80402493 .byt:0001 -80402494 .wrd:0002 -80402496 .byt:0001 -80402497 .byt:0001 -80402498 .dbl:0004 -8040249C .dbl:0004 -804024A0 .byt:0001 -804024A1 .byt:0001 -804024A2 .byt:0001 -804024A3 .byt:0001 -804024A4 .wrd:0002 -804024A6 .byt:0001 -804024A7 .byt:0001 -804024A8 .dbl:0004 -804024AC .dbl:0004 -804024B0 .byt:0001 -804024B1 .byt:0001 -804024B2 .byt:0001 -804024B3 .byt:0001 -804024B4 .wrd:0002 -804024B6 .byt:0001 -804024B7 .byt:0001 -804024B8 .dbl:0004 -804024BC .dbl:0004 -804024C0 .byt:0001 -804024C1 .byt:0001 -804024C2 .byt:0001 -804024C3 .byt:0001 -804024C4 .wrd:0002 -804024C6 .byt:0001 -804024C7 .byt:0001 -804024C8 .dbl:0004 -804024CC .dbl:0004 -804024D0 .byt:0001 -804024D1 .byt:0001 -804024D2 .byt:0001 -804024D3 .byt:0001 -804024D4 .wrd:0002 -804024D6 .byt:0001 -804024D7 .byt:0001 -804024D8 .dbl:0004 -804024DC .dbl:0004 -804024E0 .byt:0001 -804024E1 .byt:0001 -804024E2 .byt:0001 -804024E3 .byt:0001 -804024E4 .wrd:0002 -804024E6 .byt:0001 -804024E7 .byt:0001 -804024E8 .dbl:0004 -804024EC .dbl:0004 -804024F0 .byt:0001 -804024F1 .byt:0001 -804024F2 .byt:0001 -804024F3 .byt:0001 -804024F4 .wrd:0002 -804024F6 .byt:0001 -804024F7 .byt:0001 -804024F8 .dbl:0004 -804024FC .dbl:0004 -80402500 .byt:0001 -80402501 .byt:0001 -80402502 .byt:0001 -80402503 .byt:0001 -80402504 .wrd:0002 -80402506 .byt:0001 -80402507 .byt:0001 -80402508 .dbl:0004 -8040250C .dbl:0004 -80402510 .byt:0001 -80402511 .byt:0001 -80402512 .byt:0001 -80402513 .byt:0001 -80402514 .wrd:0002 -80402516 .byt:0001 -80402517 .byt:0001 -80402518 .dbl:0004 -8040251C .dbl:0004 -80402520 .byt:0001 -80402521 .byt:0001 -80402522 .byt:0001 -80402523 .byt:0001 -80402524 .wrd:0002 -80402526 .byt:0001 -80402527 .byt:0001 -80402528 .dbl:0004 -8040252C .dbl:0004 -80402530 .byt:0001 -80402531 .byt:0001 -80402532 .byt:0001 -80402533 .byt:0001 -80402534 .wrd:0002 -80402536 .byt:0001 -80402537 .byt:0001 -80402538 .dbl:0004 -8040253C .dbl:0004 -80402540 .byt:0001 -80402541 .byt:0001 -80402542 .byt:0001 -80402543 .byt:0001 -80402544 .wrd:0002 -80402546 .byt:0001 -80402547 .byt:0001 -80402548 .dbl:0004 -8040254C .dbl:0004 -80402550 .byt:0001 -80402551 .byt:0001 -80402552 .byt:0001 -80402553 .byt:0001 -80402554 .wrd:0002 -80402556 .byt:0001 -80402557 .byt:0001 -80402558 .dbl:0004 -8040255C .dbl:0004 -80402560 .byt:0001 -80402561 .byt:0001 -80402562 .byt:0001 -80402563 .byt:0001 -80402564 .wrd:0002 -80402566 .byt:0001 -80402567 .byt:0001 -80402568 .dbl:0004 -8040256C .dbl:0004 -80402570 .byt:0001 -80402571 .byt:0001 -80402572 .byt:0001 -80402573 .byt:0001 -80402574 .wrd:0002 -80402576 .byt:0001 -80402577 .byt:0001 -80402578 .dbl:0004 -8040257C .dbl:0004 -80402580 .byt:0001 -80402581 .byt:0001 -80402582 .byt:0001 -80402583 .byt:0001 -80402584 .wrd:0002 -80402586 .byt:0001 -80402587 .byt:0001 -80402588 .dbl:0004 -8040258C .dbl:0004 -80402590 no_upgrade -80402598 hookshot_upgrade -804025AC @@return -804025B4 strength_upgrade -804025D4 @@return -804025DC bomb_bag_upgrade -804025FC @@return -80402604 bow_upgrade -80402624 @@return -8040262C slingshot_upgrade -8040264C @@return -80402654 wallet_upgrade -80402674 @@return -8040267C tycoon_wallet -80402690 scale_upgrade -804026A4 @@return -804026AC nut_upgrade -804026C0 @@return -804026C8 stick_upgrade -804026DC @@return -804026E4 magic_upgrade -804026F4 @@return -804026FC arrows_to_rupee -80402710 @@return -80402718 bombs_to_rupee -8040272C @@return -80402734 seeds_to_rupee -80402748 @@return -80402750 no_effect -80402758 give_biggoron_sword -80402768 give_bottle -80402770 @@loop -8040279C @@return -804027A4 give_dungeon_item -804027C0 give_small_key -804027D8 @not_negative -804027E8 give_defense -80402808 give_magic -80402828 double_magic -80402850 bombchu_upgrade -80402874 @@return -8040287C ocarina_upgrade -80402890 @@return -80402898 give_fairy_ocarina -804028A8 give_song -804028C4 inventory_check -80402930 @@return -80402938 override_skulltula_token -80402958 @@in_table -8040299C @@extended_effect -804029D0 @@not_extended -80402A18 @@item_effect -80402A24 @@return -80402A38 override_object_npc -80402A48 override_object_chest -80402A58 override_object -80402A70 @@return -80402AB4 @@no_count_inc -80402AB8 @@no_pending_clear -80402AC0 override_graphic -80402AD8 @@return -80402AF0 override_text -80402B0C @@return -80402B14 override_action -80402B3C @@no_player_override -80402B98 @@return -80402BA0 store_item_data_hook -80402BD4 store_item_data -80402C68 @@update_base_game -80402C98 @@not_chest -80402CA8 @@not_negative -80402CAC @@return -80402CBC lookup_override -80402CE4 @@return -80402CF4 get_override_search_key -80402D34 @@not_skulltula -80402D6C @@valid_chest -80402D74 @@not_chest -80402DA4 @@valid_collectable -80402DAC @@not_collectable -80402DD4 @@not_grotto_deku_scrub -80402DE4 @@return -80402DEC scan_override_table -80402E30 @@not_coop_item -80402E38 @@lookup_loop -80402E6C @@lookup_item_found -80402EA0 @@return -80402EA8 resolve_extended_item -80402EBC @@loop -80402F10 @@not_extended -80402F14 @@return -80402F2C override_great_fairy_cutscene -80402F84 @@item_fairy -80402FA4 @@give_item -80402FD0 @@return -80402FD8 override_light_arrow_cutscene -80402FEC override_fairy_ocarina_cutscene -80403000 override_ocarina_songs -80403014 override_requiem_song -80403020 override_epona_song -80403040 override_suns_song -80403060 override_song_of_time -80403070 store_pending_special_item -80403080 @@find_duplicate_loop -8040309C @@find_empty_loop -804030B4 @@return -804030BC override_saria_song_check -804030D8 @@get_item -804030E0 set_saria_song_flag -80403100 set_dungeon_knowledge -8040312C @@set_flag -80403144 Shop_Check_Sold_Out -80403190 @@return -80403198 Shop_Set_Sold_Out -804031D0 @@return -804031D8 Shop_Keeper_Init_ID -804031F4 @@return -80403204 Deku_Check_Sold_Out -80403228 @@continue -80403258 Deku_Set_Sold_Out -8040327C @@continue -804032B0 before_game_state_update -80403300 @@loop -80403358 @@no_pending_item -8040336C after_game_state_update -80403390 item_menu_prevent_empty_equip -804033A0 @@return -804033A8 equipment_menu_prevent_empty_equip -804033C8 @@return -804033DC menu_use_blank_description -80403410 @@not_equip_menu -80403420 @@return -80403438 equipment_menu_slot_filled -80403488 give_master_sword -804034A0 before_time_travel -804034D8 after_time_travel -80403514 @@going_back -8040351C @@done -8040354C update_c_button -80403578 @@return -80403580 after_going_forward -804035BC @@no_init -804035CC after_going_back -804035FC @@not_swordless -80403604 initialize_adult -8040362C @@no_mirror_shield -8040366C init_adult_button -80403698 @@empty -804036A0 @@loop -804036F8 @@set_empty -80403704 @@return -8040370C .byt:0001 -8040370C ADULT_INIT_ITEMS -8040370D .byt:0001 -8040370E .byt:0001 -8040370F .byt:0001 -80403710 .byt:0001 -80403711 .byt:0001 -80403712 .byt:0001 -80403713 .byt:0001 -80403714 .byt:0001 -80403718 .byt:0001 -80403718 ADULT_VALID_ITEMS -80403719 .byt:0001 -8040371A .byt:0001 -8040371B .byt:0001 -8040371C .byt:0001 -8040371D .byt:0001 -8040371E .byt:0001 -8040371F .byt:0001 -80403720 .byt:0001 -80403721 .byt:0001 -80403722 .byt:0001 -80403723 .byt:0001 -80403724 .byt:0001 -80403725 .byt:0001 -80403726 .byt:0001 -80403727 .byt:0001 -80403728 .byt:0001 -80403729 .byt:0001 -8040372A .byt:0001 -8040372B .byt:0001 -8040372C .byt:0001 -8040372D .byt:0001 -8040372E .byt:0001 -8040372F .byt:0001 -80403730 suns_song_fix_event -80403764 @@child -80403774 @@return -8040377C suns_song_fix -80403790 @@check_suns_status -804037AC @@disable_suns -804037B4 @@return -804037BC warp_song_fix -804037E8 @@child -804037F8 @@return -80403800 Check_Has_Epona_Song -8040384C @@return -80403854 save_scarecrow_song -80403898 @@copy_song -804038A0 write_initial_save -804038AC @@save_data_loop -804038DC @@overwrite_type -804038E4 @@return -804038EC get_name_char_1 -80403908 get_name_char_2 -80403924 get_name_char -80403950 @@coop_player_name -80403968 @@return -80403970 reset_player_name_id -80403990 .byt:06C0 -80405000 draw_file_select_hash,00000234 -80405234 disp_buf_init,00000018 -8040524C sprite_bytes_per_tile,00000028 -80405274 sprite_bytes,00000030 -804052A4 sprite_load,000001A0 -80405444 sprite_draw,000000F0 -80405534 draw_setup,000001DC -80405710 gfx_init,00000178 -80405888 heap_init,00000014 -8040589C heap_alloc,00000034 -804058D0 file_init,00000044 -80405914 c_init,0000002C -80405940 c_after_game_state_update,00000088 -804059C8 draw_dungeon_info,000009B8 -80406380 text_init,0000002C -804063AC text_print,000000A8 -80406454 text_flush,00000148 -804065A8 .byt:0040 -804065A8 hash_symbols -804065E8 .byt:0010 -804065E8 font_sprite -804065F8 .byt:0010 -804065F8 quest_items_sprite -80406608 .byt:0010 -80406608 items_sprite -80406618 .byt:0010 -80406618 medals_sprite -80406628 .byt:0010 -80406628 stones_sprite -80406638 .byt:000E -80406638 cfg_dungeon_rewards -80406648 .byt:0012 -80406648 medal_colors -8040665C .byt:009C -8040665C dungeons -804066F8 .byt:0008 -804066F8 hash_sprites -80406700 .byt:0004 -80406700 cfg_dungeon_info_enable -80406704 .byt:0004 -80406704 dungeon_count -80406708 .byt:0004 -80406708 cfg_file_select_hash -8040670C .byt:0004 -8040670C heap_next -80406710 .byt:0004 -80406710 cfg_dungeon_info_reward_need_altar -80406714 .byt:0004 -80406714 cfg_dungeon_info_reward_need_compass -80406718 .byt:0004 -80406718 cfg_dungeon_info_mq_need_map -8040671C .byt:0004 -8040671C cfg_dungeon_info_mq_enable -80406728 .byt:0010 -80406728 setup_db -80406738 .byt:000E -80406738 cfg_dungeon_is_mq -80406746 .byt:14C8 -80406746 FONT_TEXTURE -80407C0E .byt:83F2 -80480000 DUMMY_ACTOR -80500000 C_HEAP +00000000 0 +00000000 .byt:4000000 +00000010 .dbl:0008 +00000010 ITEM_TABLE_ROW_SIZE +000005B4 Shop_Item_Save_Offset +0000D260 .dbl:0010 +0000D270 .dbl:0010 +0089E800 .byt:0400 +00B529A0 skip_GS_BGS_text +00BAF750 .byt:0048 +00D74990 skip_steal_tunic +00D7E178 @@not_in_ranch +00D7E18C @@return +00D7E18C return_from_the_other_function +00D7E3AC @@hyrule_check +00D7E3CC @@lon_lon_check +00D7E3F4 @@return_false +00D7E7A4 @@set_ev0 +00D7E7B8 set_ev1 +00D7E8A8 @@unsafe +00D7E8C0 @@safe +00D7E8D4 @@not_hyrule +00D7E920 ev0_return +00DB13D3 .byt:0001 +00DF264F .byt:0001 +00E2F093 .byt:0001 +00EBB8B0 @Deku_Check_True +00EBB8C0 @Deku_Check_False +00EC68D0 .byt:0014 +00EC69C0 .byt:0014 +00EC9CE7 .byt:0001 +8011A5D0 SAVE_CONTEXT +801C84A0 GLOBAL_CONTEXT +801D8C00 SUBSCREEN_CONTEXT +801DAA30 PLAYER_ACTOR +803A9E7E GET_ITEMTABLE +80400000 init +80400050 DebugOutput +80401000 .byt:0800 +80401000 ITEM_OVERRIDES +80401800 .byt:0400 +80401800 INITIAL_SAVE_DATA +80401C00 .byt:0001 +80401C00 PLAYER_ID +80401C01 .byt:0001 +80401C01 COOP_GET_ITEM +80401C02 .byt:0001 +80401C02 PLAYER_NAME_ID +80401C03 .byt:0100 +80401C03 PLAYER_NAMES +80401D03 .byt:0001 +80401D03 LIGHT_ARROW_ITEM +80401D04 .byt:0001 +80401D04 FAIRY_OCARINA_ITEM +80401D05 .byt:0001 +80401D05 FAIRY_ITEMS +80401D06 .byt:0001 +80401D07 .byt:0001 +80401D08 .byt:0001 +80401D09 .byt:0001 +80401D0A .byt:0001 +80401D0C .byt:02F4 +80402000 .dbl:0008 +80402000 PLAYER_OVERRIDE_DATA +80402008 .dbl:0010 +80402008 EXTENDED_ITEM_DATA +80402018 .byt:0001 +80402018 PENDING_SPECIAL_ITEM +80402019 .byt:0001 +8040201A .byt:0001 +8040201B .byt:0001 +8040201B PENDING_SPECIAL_ITEM_END +8040201C .dbl:0004 +8040201C TIME_TRAVEL_SAVED_EQUIPS +80402020 .dbl:0004 +80402024 .wrd:0002 +80402026 .wrd:0002 +80402028 .byt:0028 +80402050 .byt:0001 +80402050 ITEM_TABLE +80402051 .byt:0001 +80402052 .byt:0001 +80402053 .byt:0001 +80402054 .wrd:0002 +80402056 .byt:0001 +80402057 .byt:0001 +80402058 .dbl:0004 +8040205C .dbl:0004 +80402060 .byt:0001 +80402061 .byt:0001 +80402062 .byt:0001 +80402063 .byt:0001 +80402064 .wrd:0002 +80402066 .byt:0001 +80402067 .byt:0001 +80402068 .dbl:0004 +8040206C .dbl:0004 +80402070 .byt:0001 +80402071 .byt:0001 +80402072 .byt:0001 +80402073 .byt:0001 +80402074 .wrd:0002 +80402076 .byt:0001 +80402077 .byt:0001 +80402078 .dbl:0004 +8040207C .dbl:0004 +80402080 .byt:0001 +80402081 .byt:0001 +80402082 .byt:0001 +80402083 .byt:0001 +80402084 .wrd:0002 +80402086 .byt:0001 +80402087 .byt:0001 +80402088 .dbl:0004 +8040208C .dbl:0004 +80402090 .byt:0001 +80402091 .byt:0001 +80402092 .byt:0001 +80402093 .byt:0001 +80402094 .wrd:0002 +80402096 .byt:0001 +80402097 .byt:0001 +80402098 .dbl:0004 +8040209C .dbl:0004 +804020A0 .byt:0001 +804020A1 .byt:0001 +804020A2 .byt:0001 +804020A3 .byt:0001 +804020A4 .wrd:0002 +804020A6 .byt:0001 +804020A7 .byt:0001 +804020A8 .dbl:0004 +804020AC .dbl:0004 +804020B0 .byt:0001 +804020B1 .byt:0001 +804020B2 .byt:0001 +804020B3 .byt:0001 +804020B4 .wrd:0002 +804020B6 .byt:0001 +804020B7 .byt:0001 +804020B8 .dbl:0004 +804020BC .dbl:0004 +804020C0 .byt:0001 +804020C1 .byt:0001 +804020C2 .byt:0001 +804020C3 .byt:0001 +804020C4 .wrd:0002 +804020C6 .byt:0001 +804020C7 .byt:0001 +804020C8 .dbl:0004 +804020CC .dbl:0004 +804020D0 .byt:0001 +804020D1 .byt:0001 +804020D2 .byt:0001 +804020D3 .byt:0001 +804020D4 .wrd:0002 +804020D6 .byt:0001 +804020D7 .byt:0001 +804020D8 .dbl:0004 +804020DC .dbl:0004 +804020E0 .byt:0001 +804020E1 .byt:0001 +804020E2 .byt:0001 +804020E3 .byt:0001 +804020E4 .wrd:0002 +804020E6 .byt:0001 +804020E7 .byt:0001 +804020E8 .dbl:0004 +804020EC .dbl:0004 +804020F0 .byt:0001 +804020F1 .byt:0001 +804020F2 .byt:0001 +804020F3 .byt:0001 +804020F4 .wrd:0002 +804020F6 .byt:0001 +804020F7 .byt:0001 +804020F8 .dbl:0004 +804020FC .dbl:0004 +80402100 .byt:0001 +80402101 .byt:0001 +80402102 .byt:0001 +80402103 .byt:0001 +80402104 .wrd:0002 +80402106 .byt:0001 +80402107 .byt:0001 +80402108 .dbl:0004 +8040210C .dbl:0004 +80402110 .byt:0001 +80402111 .byt:0001 +80402112 .byt:0001 +80402113 .byt:0001 +80402114 .wrd:0002 +80402116 .byt:0001 +80402117 .byt:0001 +80402118 .dbl:0004 +8040211C .dbl:0004 +80402120 .byt:0001 +80402121 .byt:0001 +80402122 .byt:0001 +80402123 .byt:0001 +80402124 .wrd:0002 +80402126 .byt:0001 +80402127 .byt:0001 +80402128 .dbl:0004 +8040212C .dbl:0004 +80402130 .byt:0001 +80402131 .byt:0001 +80402132 .byt:0001 +80402133 .byt:0001 +80402134 .wrd:0002 +80402136 .byt:0001 +80402137 .byt:0001 +80402138 .dbl:0004 +8040213C .dbl:0004 +80402140 .byt:0001 +80402141 .byt:0001 +80402142 .byt:0001 +80402143 .byt:0001 +80402144 .wrd:0002 +80402146 .byt:0001 +80402147 .byt:0001 +80402148 .dbl:0004 +8040214C .dbl:0004 +80402150 .byt:0001 +80402151 .byt:0001 +80402152 .byt:0001 +80402153 .byt:0001 +80402154 .wrd:0002 +80402156 .byt:0001 +80402157 .byt:0001 +80402158 .dbl:0004 +8040215C .dbl:0004 +80402160 .byt:0001 +80402161 .byt:0001 +80402162 .byt:0001 +80402163 .byt:0001 +80402164 .wrd:0002 +80402166 .byt:0001 +80402167 .byt:0001 +80402168 .dbl:0004 +8040216C .dbl:0004 +80402170 .byt:0001 +80402171 .byt:0001 +80402172 .byt:0001 +80402173 .byt:0001 +80402174 .wrd:0002 +80402176 .byt:0001 +80402177 .byt:0001 +80402178 .dbl:0004 +8040217C .dbl:0004 +80402180 .byt:0001 +80402181 .byt:0001 +80402182 .byt:0001 +80402183 .byt:0001 +80402184 .wrd:0002 +80402186 .byt:0001 +80402187 .byt:0001 +80402188 .dbl:0004 +8040218C .dbl:0004 +80402190 .byt:0001 +80402191 .byt:0001 +80402192 .byt:0001 +80402193 .byt:0001 +80402194 .wrd:0002 +80402196 .byt:0001 +80402197 .byt:0001 +80402198 .dbl:0004 +8040219C .dbl:0004 +804021A0 .byt:0001 +804021A1 .byt:0001 +804021A2 .byt:0001 +804021A3 .byt:0001 +804021A4 .wrd:0002 +804021A6 .byt:0001 +804021A7 .byt:0001 +804021A8 .dbl:0004 +804021AC .dbl:0004 +804021B0 .byt:0001 +804021B1 .byt:0001 +804021B2 .byt:0001 +804021B3 .byt:0001 +804021B4 .wrd:0002 +804021B6 .byt:0001 +804021B7 .byt:0001 +804021B8 .dbl:0004 +804021BC .dbl:0004 +804021C0 .byt:0001 +804021C1 .byt:0001 +804021C2 .byt:0001 +804021C3 .byt:0001 +804021C4 .wrd:0002 +804021C6 .byt:0001 +804021C7 .byt:0001 +804021C8 .dbl:0004 +804021CC .dbl:0004 +804021D0 .byt:0001 +804021D1 .byt:0001 +804021D2 .byt:0001 +804021D3 .byt:0001 +804021D4 .wrd:0002 +804021D6 .byt:0001 +804021D7 .byt:0001 +804021D8 .dbl:0004 +804021DC .dbl:0004 +804021E0 .byt:0001 +804021E1 .byt:0001 +804021E2 .byt:0001 +804021E3 .byt:0001 +804021E4 .wrd:0002 +804021E6 .byt:0001 +804021E7 .byt:0001 +804021E8 .dbl:0004 +804021EC .dbl:0004 +804021F0 .byt:0001 +804021F1 .byt:0001 +804021F2 .byt:0001 +804021F3 .byt:0001 +804021F4 .wrd:0002 +804021F6 .byt:0001 +804021F7 .byt:0001 +804021F8 .dbl:0004 +804021FC .dbl:0004 +80402200 .byt:0001 +80402201 .byt:0001 +80402202 .byt:0001 +80402203 .byt:0001 +80402204 .wrd:0002 +80402206 .byt:0001 +80402207 .byt:0001 +80402208 .dbl:0004 +8040220C .dbl:0004 +80402210 .byt:0001 +80402211 .byt:0001 +80402212 .byt:0001 +80402213 .byt:0001 +80402214 .wrd:0002 +80402216 .byt:0001 +80402217 .byt:0001 +80402218 .dbl:0004 +8040221C .dbl:0004 +80402220 .byt:0001 +80402221 .byt:0001 +80402222 .byt:0001 +80402223 .byt:0001 +80402224 .wrd:0002 +80402226 .byt:0001 +80402227 .byt:0001 +80402228 .dbl:0004 +8040222C .dbl:0004 +80402230 .byt:0001 +80402231 .byt:0001 +80402232 .byt:0001 +80402233 .byt:0001 +80402234 .wrd:0002 +80402236 .byt:0001 +80402237 .byt:0001 +80402238 .dbl:0004 +8040223C .dbl:0004 +80402240 .byt:0001 +80402241 .byt:0001 +80402242 .byt:0001 +80402243 .byt:0001 +80402244 .wrd:0002 +80402246 .byt:0001 +80402247 .byt:0001 +80402248 .dbl:0004 +8040224C .dbl:0004 +80402250 .byt:0001 +80402251 .byt:0001 +80402252 .byt:0001 +80402253 .byt:0001 +80402254 .wrd:0002 +80402256 .byt:0001 +80402257 .byt:0001 +80402258 .dbl:0004 +8040225C .dbl:0004 +80402260 .byt:0001 +80402261 .byt:0001 +80402262 .byt:0001 +80402263 .byt:0001 +80402264 .wrd:0002 +80402266 .byt:0001 +80402267 .byt:0001 +80402268 .dbl:0004 +8040226C .dbl:0004 +80402270 .byt:0001 +80402271 .byt:0001 +80402272 .byt:0001 +80402273 .byt:0001 +80402274 .wrd:0002 +80402276 .byt:0001 +80402277 .byt:0001 +80402278 .dbl:0004 +8040227C .dbl:0004 +80402280 .byt:0001 +80402281 .byt:0001 +80402282 .byt:0001 +80402283 .byt:0001 +80402284 .wrd:0002 +80402286 .byt:0001 +80402287 .byt:0001 +80402288 .dbl:0004 +8040228C .dbl:0004 +80402290 .byt:0001 +80402291 .byt:0001 +80402292 .byt:0001 +80402293 .byt:0001 +80402294 .wrd:0002 +80402296 .byt:0001 +80402297 .byt:0001 +80402298 .dbl:0004 +8040229C .dbl:0004 +804022A0 .byt:0001 +804022A1 .byt:0001 +804022A2 .byt:0001 +804022A3 .byt:0001 +804022A4 .wrd:0002 +804022A6 .byt:0001 +804022A7 .byt:0001 +804022A8 .dbl:0004 +804022AC .dbl:0004 +804022B0 .byt:0001 +804022B1 .byt:0001 +804022B2 .byt:0001 +804022B3 .byt:0001 +804022B4 .wrd:0002 +804022B6 .byt:0001 +804022B7 .byt:0001 +804022B8 .dbl:0004 +804022BC .dbl:0004 +804022C0 .byt:0001 +804022C1 .byt:0001 +804022C2 .byt:0001 +804022C3 .byt:0001 +804022C4 .wrd:0002 +804022C6 .byt:0001 +804022C7 .byt:0001 +804022C8 .dbl:0004 +804022CC .dbl:0004 +804022D0 .byt:0001 +804022D1 .byt:0001 +804022D2 .byt:0001 +804022D3 .byt:0001 +804022D4 .wrd:0002 +804022D6 .byt:0001 +804022D7 .byt:0001 +804022D8 .dbl:0004 +804022DC .dbl:0004 +804022E0 .byt:0001 +804022E1 .byt:0001 +804022E2 .byt:0001 +804022E3 .byt:0001 +804022E4 .wrd:0002 +804022E6 .byt:0001 +804022E7 .byt:0001 +804022E8 .dbl:0004 +804022EC .dbl:0004 +804022F0 .byt:0001 +804022F1 .byt:0001 +804022F2 .byt:0001 +804022F3 .byt:0001 +804022F4 .wrd:0002 +804022F6 .byt:0001 +804022F7 .byt:0001 +804022F8 .dbl:0004 +804022FC .dbl:0004 +80402300 .byt:0001 +80402301 .byt:0001 +80402302 .byt:0001 +80402303 .byt:0001 +80402304 .wrd:0002 +80402306 .byt:0001 +80402307 .byt:0001 +80402308 .dbl:0004 +8040230C .dbl:0004 +80402310 .byt:0001 +80402311 .byt:0001 +80402312 .byt:0001 +80402313 .byt:0001 +80402314 .wrd:0002 +80402316 .byt:0001 +80402317 .byt:0001 +80402318 .dbl:0004 +8040231C .dbl:0004 +80402320 .byt:0001 +80402321 .byt:0001 +80402322 .byt:0001 +80402323 .byt:0001 +80402324 .wrd:0002 +80402326 .byt:0001 +80402327 .byt:0001 +80402328 .dbl:0004 +8040232C .dbl:0004 +80402330 .byt:0001 +80402331 .byt:0001 +80402332 .byt:0001 +80402333 .byt:0001 +80402334 .wrd:0002 +80402336 .byt:0001 +80402337 .byt:0001 +80402338 .dbl:0004 +8040233C .dbl:0004 +80402340 .byt:0001 +80402341 .byt:0001 +80402342 .byt:0001 +80402343 .byt:0001 +80402344 .wrd:0002 +80402346 .byt:0001 +80402347 .byt:0001 +80402348 .dbl:0004 +8040234C .dbl:0004 +80402350 .byt:0001 +80402351 .byt:0001 +80402352 .byt:0001 +80402353 .byt:0001 +80402354 .wrd:0002 +80402356 .byt:0001 +80402357 .byt:0001 +80402358 .dbl:0004 +8040235C .dbl:0004 +80402360 .byt:0001 +80402361 .byt:0001 +80402362 .byt:0001 +80402363 .byt:0001 +80402364 .wrd:0002 +80402366 .byt:0001 +80402367 .byt:0001 +80402368 .dbl:0004 +8040236C .dbl:0004 +80402370 .byt:0001 +80402371 .byt:0001 +80402372 .byt:0001 +80402373 .byt:0001 +80402374 .wrd:0002 +80402376 .byt:0001 +80402377 .byt:0001 +80402378 .dbl:0004 +8040237C .dbl:0004 +80402380 .byt:0001 +80402381 .byt:0001 +80402382 .byt:0001 +80402383 .byt:0001 +80402384 .wrd:0002 +80402386 .byt:0001 +80402387 .byt:0001 +80402388 .dbl:0004 +8040238C .dbl:0004 +80402390 .byt:0001 +80402391 .byt:0001 +80402392 .byt:0001 +80402393 .byt:0001 +80402394 .wrd:0002 +80402396 .byt:0001 +80402397 .byt:0001 +80402398 .dbl:0004 +8040239C .dbl:0004 +804023A0 .byt:0001 +804023A1 .byt:0001 +804023A2 .byt:0001 +804023A3 .byt:0001 +804023A4 .wrd:0002 +804023A6 .byt:0001 +804023A7 .byt:0001 +804023A8 .dbl:0004 +804023AC .dbl:0004 +804023B0 .byt:0001 +804023B1 .byt:0001 +804023B2 .byt:0001 +804023B3 .byt:0001 +804023B4 .wrd:0002 +804023B6 .byt:0001 +804023B7 .byt:0001 +804023B8 .dbl:0004 +804023BC .dbl:0004 +804023C0 .byt:0001 +804023C1 .byt:0001 +804023C2 .byt:0001 +804023C3 .byt:0001 +804023C4 .wrd:0002 +804023C6 .byt:0001 +804023C7 .byt:0001 +804023C8 .dbl:0004 +804023CC .dbl:0004 +804023D0 .byt:0001 +804023D1 .byt:0001 +804023D2 .byt:0001 +804023D3 .byt:0001 +804023D4 .wrd:0002 +804023D6 .byt:0001 +804023D7 .byt:0001 +804023D8 .dbl:0004 +804023DC .dbl:0004 +804023E0 .byt:0001 +804023E1 .byt:0001 +804023E2 .byt:0001 +804023E3 .byt:0001 +804023E4 .wrd:0002 +804023E6 .byt:0001 +804023E7 .byt:0001 +804023E8 .dbl:0004 +804023EC .dbl:0004 +804023F0 .byt:0001 +804023F1 .byt:0001 +804023F2 .byt:0001 +804023F3 .byt:0001 +804023F4 .wrd:0002 +804023F6 .byt:0001 +804023F7 .byt:0001 +804023F8 .dbl:0004 +804023FC .dbl:0004 +80402400 .byt:0001 +80402401 .byt:0001 +80402402 .byt:0001 +80402403 .byt:0001 +80402404 .wrd:0002 +80402406 .byt:0001 +80402407 .byt:0001 +80402408 .dbl:0004 +8040240C .dbl:0004 +80402410 .byt:0001 +80402411 .byt:0001 +80402412 .byt:0001 +80402413 .byt:0001 +80402414 .wrd:0002 +80402416 .byt:0001 +80402417 .byt:0001 +80402418 .dbl:0004 +8040241C .dbl:0004 +80402420 .byt:0001 +80402421 .byt:0001 +80402422 .byt:0001 +80402423 .byt:0001 +80402424 .wrd:0002 +80402426 .byt:0001 +80402427 .byt:0001 +80402428 .dbl:0004 +8040242C .dbl:0004 +80402430 .byt:0001 +80402431 .byt:0001 +80402432 .byt:0001 +80402433 .byt:0001 +80402434 .wrd:0002 +80402436 .byt:0001 +80402437 .byt:0001 +80402438 .dbl:0004 +8040243C .dbl:0004 +80402440 .byt:0001 +80402441 .byt:0001 +80402442 .byt:0001 +80402443 .byt:0001 +80402444 .wrd:0002 +80402446 .byt:0001 +80402447 .byt:0001 +80402448 .dbl:0004 +8040244C .dbl:0004 +80402450 .byt:0001 +80402451 .byt:0001 +80402452 .byt:0001 +80402453 .byt:0001 +80402454 .wrd:0002 +80402456 .byt:0001 +80402457 .byt:0001 +80402458 .dbl:0004 +8040245C .dbl:0004 +80402460 .byt:0001 +80402461 .byt:0001 +80402462 .byt:0001 +80402463 .byt:0001 +80402464 .wrd:0002 +80402466 .byt:0001 +80402467 .byt:0001 +80402468 .dbl:0004 +8040246C .dbl:0004 +80402470 .byt:0001 +80402471 .byt:0001 +80402472 .byt:0001 +80402473 .byt:0001 +80402474 .wrd:0002 +80402476 .byt:0001 +80402477 .byt:0001 +80402478 .dbl:0004 +8040247C .dbl:0004 +80402480 .byt:0001 +80402481 .byt:0001 +80402482 .byt:0001 +80402483 .byt:0001 +80402484 .wrd:0002 +80402486 .byt:0001 +80402487 .byt:0001 +80402488 .dbl:0004 +8040248C .dbl:0004 +80402490 .byt:0001 +80402491 .byt:0001 +80402492 .byt:0001 +80402493 .byt:0001 +80402494 .wrd:0002 +80402496 .byt:0001 +80402497 .byt:0001 +80402498 .dbl:0004 +8040249C .dbl:0004 +804024A0 .byt:0001 +804024A1 .byt:0001 +804024A2 .byt:0001 +804024A3 .byt:0001 +804024A4 .wrd:0002 +804024A6 .byt:0001 +804024A7 .byt:0001 +804024A8 .dbl:0004 +804024AC .dbl:0004 +804024B0 .byt:0001 +804024B1 .byt:0001 +804024B2 .byt:0001 +804024B3 .byt:0001 +804024B4 .wrd:0002 +804024B6 .byt:0001 +804024B7 .byt:0001 +804024B8 .dbl:0004 +804024BC .dbl:0004 +804024C0 .byt:0001 +804024C1 .byt:0001 +804024C2 .byt:0001 +804024C3 .byt:0001 +804024C4 .wrd:0002 +804024C6 .byt:0001 +804024C7 .byt:0001 +804024C8 .dbl:0004 +804024CC .dbl:0004 +804024D0 .byt:0001 +804024D1 .byt:0001 +804024D2 .byt:0001 +804024D3 .byt:0001 +804024D4 .wrd:0002 +804024D6 .byt:0001 +804024D7 .byt:0001 +804024D8 .dbl:0004 +804024DC .dbl:0004 +804024E0 .byt:0001 +804024E1 .byt:0001 +804024E2 .byt:0001 +804024E3 .byt:0001 +804024E4 .wrd:0002 +804024E6 .byt:0001 +804024E7 .byt:0001 +804024E8 .dbl:0004 +804024EC .dbl:0004 +804024F0 .byt:0001 +804024F1 .byt:0001 +804024F2 .byt:0001 +804024F3 .byt:0001 +804024F4 .wrd:0002 +804024F6 .byt:0001 +804024F7 .byt:0001 +804024F8 .dbl:0004 +804024FC .dbl:0004 +80402500 .byt:0001 +80402501 .byt:0001 +80402502 .byt:0001 +80402503 .byt:0001 +80402504 .wrd:0002 +80402506 .byt:0001 +80402507 .byt:0001 +80402508 .dbl:0004 +8040250C .dbl:0004 +80402510 .byt:0001 +80402511 .byt:0001 +80402512 .byt:0001 +80402513 .byt:0001 +80402514 .wrd:0002 +80402516 .byt:0001 +80402517 .byt:0001 +80402518 .dbl:0004 +8040251C .dbl:0004 +80402520 .byt:0001 +80402521 .byt:0001 +80402522 .byt:0001 +80402523 .byt:0001 +80402524 .wrd:0002 +80402526 .byt:0001 +80402527 .byt:0001 +80402528 .dbl:0004 +8040252C .dbl:0004 +80402530 .byt:0001 +80402531 .byt:0001 +80402532 .byt:0001 +80402533 .byt:0001 +80402534 .wrd:0002 +80402536 .byt:0001 +80402537 .byt:0001 +80402538 .dbl:0004 +8040253C .dbl:0004 +80402540 .byt:0001 +80402541 .byt:0001 +80402542 .byt:0001 +80402543 .byt:0001 +80402544 .wrd:0002 +80402546 .byt:0001 +80402547 .byt:0001 +80402548 .dbl:0004 +8040254C .dbl:0004 +80402550 .byt:0001 +80402551 .byt:0001 +80402552 .byt:0001 +80402553 .byt:0001 +80402554 .wrd:0002 +80402556 .byt:0001 +80402557 .byt:0001 +80402558 .dbl:0004 +8040255C .dbl:0004 +80402560 .byt:0001 +80402561 .byt:0001 +80402562 .byt:0001 +80402563 .byt:0001 +80402564 .wrd:0002 +80402566 .byt:0001 +80402567 .byt:0001 +80402568 .dbl:0004 +8040256C .dbl:0004 +80402570 .byt:0001 +80402571 .byt:0001 +80402572 .byt:0001 +80402573 .byt:0001 +80402574 .wrd:0002 +80402576 .byt:0001 +80402577 .byt:0001 +80402578 .dbl:0004 +8040257C .dbl:0004 +80402580 .byt:0001 +80402581 .byt:0001 +80402582 .byt:0001 +80402583 .byt:0001 +80402584 .wrd:0002 +80402586 .byt:0001 +80402587 .byt:0001 +80402588 .dbl:0004 +8040258C .dbl:0004 +80402590 no_upgrade +80402598 hookshot_upgrade +804025AC @@return +804025B4 strength_upgrade +804025D4 @@return +804025DC bomb_bag_upgrade +804025FC @@return +80402604 bow_upgrade +80402624 @@return +8040262C slingshot_upgrade +8040264C @@return +80402654 wallet_upgrade +80402674 @@return +8040267C tycoon_wallet +80402690 scale_upgrade +804026A4 @@return +804026AC nut_upgrade +804026C0 @@return +804026C8 stick_upgrade +804026DC @@return +804026E4 magic_upgrade +804026F4 @@return +804026FC arrows_to_rupee +80402710 @@return +80402718 bombs_to_rupee +8040272C @@return +80402734 seeds_to_rupee +80402748 @@return +80402750 no_effect +80402758 give_biggoron_sword +80402768 give_bottle +80402770 @@loop +8040279C @@return +804027A4 give_dungeon_item +804027C0 give_small_key +804027D8 @not_negative +804027E8 give_defense +80402808 give_magic +80402828 double_magic +80402850 bombchu_upgrade +80402874 @@return +8040287C ocarina_upgrade +80402890 @@return +80402898 give_fairy_ocarina +804028A8 give_song +804028C4 inventory_check +80402930 @@return +80402938 override_skulltula_token +80402958 @@in_table +8040299C @@extended_effect +804029D0 @@not_extended +80402A18 @@item_effect +80402A24 @@return +80402A38 override_object_npc +80402A48 override_object_chest +80402A58 override_object +80402A70 @@return +80402AB4 @@no_count_inc +80402AB8 @@no_pending_clear +80402AC0 override_graphic +80402AD8 @@return +80402AF0 override_text +80402B0C @@return +80402B14 override_action +80402B3C @@no_player_override +80402B98 @@return +80402BA0 store_item_data_hook +80402BD4 store_item_data +80402C68 @@update_base_game +80402C98 @@not_chest +80402CA8 @@not_negative +80402CAC @@return +80402CBC lookup_override +80402CE4 @@return +80402CF4 get_override_search_key +80402D34 @@not_skulltula +80402D6C @@valid_chest +80402D74 @@not_chest +80402DA4 @@valid_collectable +80402DAC @@not_collectable +80402DD4 @@not_grotto_deku_scrub +80402DE4 @@return +80402DEC scan_override_table +80402E30 @@not_coop_item +80402E38 @@lookup_loop +80402E6C @@lookup_item_found +80402EA0 @@return +80402EA8 resolve_extended_item +80402EBC @@loop +80402F10 @@not_extended +80402F14 @@return +80402F2C override_great_fairy_cutscene +80402F84 @@item_fairy +80402FA4 @@give_item +80402FD0 @@return +80402FD8 override_light_arrow_cutscene +80402FEC override_fairy_ocarina_cutscene +80403000 override_ocarina_songs +80403014 override_requiem_song +80403020 override_epona_song +80403040 override_suns_song +80403060 override_song_of_time +80403070 store_pending_special_item +80403080 @@find_duplicate_loop +8040309C @@find_empty_loop +804030B4 @@return +804030BC override_saria_song_check +804030D8 @@get_item +804030E0 set_saria_song_flag +80403100 set_dungeon_knowledge +8040312C @@set_flag +80403144 Shop_Check_Sold_Out +80403190 @@return +80403198 Shop_Set_Sold_Out +804031D0 @@return +804031D8 Shop_Keeper_Init_ID +804031F4 @@return +80403204 Deku_Check_Sold_Out +80403228 @@continue +80403258 Deku_Set_Sold_Out +8040327C @@continue +804032B0 before_game_state_update +80403300 @@loop +80403358 @@no_pending_item +8040336C after_game_state_update +80403390 item_menu_prevent_empty_equip +804033A0 @@return +804033A8 equipment_menu_prevent_empty_equip +804033C8 @@return +804033DC menu_use_blank_description +80403410 @@not_equip_menu +80403420 @@return +80403438 equipment_menu_slot_filled +80403488 give_master_sword +804034A0 before_time_travel +804034D8 after_time_travel +80403514 @@going_back +8040351C @@done +8040354C update_c_button +80403578 @@return +80403580 after_going_forward +804035BC @@no_init +804035CC after_going_back +804035FC @@not_swordless +80403604 initialize_adult +8040362C @@no_mirror_shield +8040366C init_adult_button +80403698 @@empty +804036A0 @@loop +804036F8 @@set_empty +80403704 @@return +8040370C .byt:0001 +8040370C ADULT_INIT_ITEMS +8040370D .byt:0001 +8040370E .byt:0001 +8040370F .byt:0001 +80403710 .byt:0001 +80403711 .byt:0001 +80403712 .byt:0001 +80403713 .byt:0001 +80403714 .byt:0001 +80403718 .byt:0001 +80403718 ADULT_VALID_ITEMS +80403719 .byt:0001 +8040371A .byt:0001 +8040371B .byt:0001 +8040371C .byt:0001 +8040371D .byt:0001 +8040371E .byt:0001 +8040371F .byt:0001 +80403720 .byt:0001 +80403721 .byt:0001 +80403722 .byt:0001 +80403723 .byt:0001 +80403724 .byt:0001 +80403725 .byt:0001 +80403726 .byt:0001 +80403727 .byt:0001 +80403728 .byt:0001 +80403729 .byt:0001 +8040372A .byt:0001 +8040372B .byt:0001 +8040372C .byt:0001 +8040372D .byt:0001 +8040372E .byt:0001 +8040372F .byt:0001 +80403730 suns_song_fix_event +80403764 @@child +80403774 @@return +8040377C suns_song_fix +80403790 @@check_suns_status +804037AC @@disable_suns +804037B4 @@return +804037BC warp_song_fix +804037E8 @@child +804037F8 @@return +80403800 Check_Has_Epona_Song +8040384C @@return +80403854 save_scarecrow_song +80403898 @@copy_song +804038A0 write_initial_save +804038AC @@save_data_loop +804038DC @@overwrite_type +804038E4 @@return +804038EC get_name_char_1 +80403908 get_name_char_2 +80403924 get_name_char +80403950 @@coop_player_name +80403968 @@return +80403970 reset_player_name_id +80403990 .byt:06C0 +80405000 text_init,0000002C +8040502C text_print,000000A8 +804050D4 text_flush,00000148 +8040521C draw_dungeon_info,000009B8 +80405BD4 c_init,0000002C +80405C00 c_after_game_state_update,00000088 +80405C88 heap_init,00000014 +80405C9C heap_alloc,00000034 +80405CD0 file_init,00000044 +80405D14 disp_buf_init,00000018 +80405D2C sprite_bytes_per_tile,00000028 +80405D54 sprite_bytes,00000030 +80405D84 sprite_load,000001A0 +80405F24 sprite_draw,000000F0 +80406014 draw_setup,000001DC +804061F0 gfx_init,00000178 +80406368 draw_file_select_hash,00000234 +804065A8 .byt:000E +804065A8 cfg_dungeon_rewards +804065B8 .byt:0012 +804065B8 medal_colors +804065CC .byt:009C +804065CC dungeons +80406668 .byt:0010 +80406668 font_sprite +80406678 .byt:0010 +80406678 quest_items_sprite +80406688 .byt:0010 +80406688 items_sprite +80406698 .byt:0010 +80406698 medals_sprite +804066A8 .byt:0010 +804066A8 stones_sprite +804066B8 .byt:0040 +804066B8 hash_symbols +804066F8 .byt:0004 +804066F8 cfg_dungeon_info_enable +804066FC .byt:0004 +804066FC dungeon_count +80406700 .byt:0008 +80406700 hash_sprites +80406710 .byt:0004 +80406710 cfg_dungeon_info_reward_need_altar +80406714 .byt:0004 +80406714 cfg_dungeon_info_reward_need_compass +80406718 .byt:0004 +80406718 cfg_dungeon_info_mq_need_map +8040671C .byt:0004 +8040671C cfg_dungeon_info_mq_enable +80406720 .byt:0004 +80406720 heap_next +80406724 .byt:0004 +80406724 cfg_file_select_hash +80406728 .byt:000E +80406728 cfg_dungeon_is_mq +80406738 .byt:0010 +80406738 setup_db +80406748 .byt:14C8 +80406748 FONT_TEXTURE +80407C10 .byt:83F0 +80480000 DUMMY_ACTOR +80500000 C_HEAP  \ No newline at end of file diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index 55cef123ced6ede707ac9599d7291bfc7eadfdcc..9dec7528b1ffe68144cdb0497bb14222425b45c5 100644 GIT binary patch delta 2837 zcmZWrO-x)>82#S!&CGi9c8y6(d7Ldm2PgYPZ>k?yo4xST$Y-+SpxmJ>A9e1v(WX0PYuZTKID)pAX4E*HP=1(V(v!DIL1xoNvM z`prm(9e?X>krS7$TsTtIKi~{t513Xa}qh zaEj}&8`J$!*dv}~lz)ghuWjf+i3x9kQ1LVtnBX(a8PHdL2lIA}iU#;rB(cmjCv zap)ZU<_eAdHXnxFyf+{&#+w;ki$NcY3ps9skRMT=SKg((TlpZ0pnnla|LeLxq5Joh zKQP=vcW7T?SLk5n_&xzr05&Wp|<#faK#M`G}Onp1_0)Ga^T5Pyv$PGYai_BhY@Re93TVk_Oo09ViX3cTf=va8ST5 zu0!xHt~cS0K@I`?$vg1IAV+}*qj(q`D13zc}AD#T42Keyf3xeyTAb(jP$1t6YVP`i^RzT0c!yL~u+CUBuBbbMeExP$7r ztd8qy_eAafG70$hX95r1VF6y!B=D+D0xxU)ye8x4p>uqiJO~c`N;B%XsD}5|5JK2; zZ%GYRh_|8%RyBbN^Hf-TL=$Wnzxb$$AD>i?PEu(6mWfk}LlGZ~ctzwzR1%*BlHbKE zo%|k$`n@&zC{gzqDV(0$|(&ZCQ~u*4B_FC@B6;zW;0oahsI7KJ5H$YBTPpLitl z0vG-esRbsBB3a^;$g2pLya_~tB!nIyLeK%OqhldQWg&m490K@8tr`$H3fv|J{RWXv za6hkz{Z0qx@1sS0Zv8RyxcTGe`S&Nx^Y0@;hWikbfdC(^<2~a~o1^k)@GlAjSIpDn zqjMDCKTy6TvWND|K>DxgdKp;42ENYWD>&6^98)>-s!XAUd{w5PIK&>276eYs>OK;2 zJ>4Wyk2q=g*OSBl5P1iX9C7N%5vPtEh4S7?-^TOLyOE!`4E_(~C$o`=tCpC>84?RP zGvWZ2h~pwJ6U+FQg}8{bB(9uu delta 2830 zcmZWrO=whC6h7}cIy0Gh^B*(OF~%Bev^E`Ww6>0PBq@ZFN?M}0kQ!^E2_2K55wZwO z+EU0Oi`ZvDiiIq)2yG~VL?3!+`<;7! zzI*PSH(5Ntcz)ueow6zad&(PgtLbKUZp7={;crC8{X+Eq+?Vc8;Y>pyAcburGoMJ# zFnfD!ua`Rz(uMIWlD$2D%E{i|XmPTBvoql2{3+)P%p2YP;atH*aEoO9PB&lm!G|Je z2X0)yT=MH`-t&LmdDc(vT#l$72jKaGHG}?oZO$L5t??7tfL~Mli+`@M2Kc^zIs2|( z%oe}O7W~cHKg;p0eFWs6KQOO;iRWJ8`(NV6wm5J*##t)45cOpmq~isLACdbWc(Wz=8F^PQ7K}f_TIES7{I1|``TvdFt*~vVzXOr( z6a-BgPh)Kqqaq0PoqZsDXs7}|j7~NK*DT;T){3@{4mf9!a0ona>u0%!VI6Qj#m2y$ zVOxi1I!<=gLsi6}fhG7@xO>`bvQ7m;3qw-M9L$^$hf1>g&Hc0NT*rlIO=! z8R{8k%utX2*Pg`OnYxeNG7j)nUf(t#6biPui+l-4jtg;|`~i?0I%~-v0>K^hzX2_A z@*?|z?x@H+z-{%4!Gg#s@Zd#5tXKFQkpsw64&KECiGq{(y1)>e0+LVT9LZ;a}5bEb$uNj#!Th z5bM!Jy&I8DtrNvYStt4&=g&(J#RBhuhn?~=c?os&GV18nt01pI1$lWD#4d+Sy_g()PC z!WF*;O&D*~gmHAL5(fbk5}((d$4y9l$>JWFUl}{CIIdd(3Sfb!=7^)=UBHP{?m~is z$RUVvi6JeJfCJ+aqZ*gEXMU6BH>LR#Gv+s|e&xi16(?KuCGDN8-pyO4Tjg`aETG+MqJ zJ4<6He8Z(D@K!^j^c^4)rSBTY&MJJt_@eP;<15BdhnF|~6j)}0O?Aj1ITK`Bjkg(x zKn7$`n6KK*thPEs0kpFq?A3YgWX1$l7tDT9{i@NKieI Date: Mon, 22 Oct 2018 23:16:38 -0600 Subject: [PATCH 2/3] Update icons to be transparent --- data/ER16.gif | Bin 1051 -> 986 bytes data/ER32.gif | Bin 1544 -> 1493 bytes data/ER48.gif | Bin 2391 -> 2299 bytes version.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ER16.gif b/data/ER16.gif index ceb4a8588b37ac76b1e87b09cc19414bb6c7abf6..f4a954cb5fdc83463a8ccbdc190b3656ba939dd2 100644 GIT binary patch delta 623 zcmV-#0+9Wi2-*jKM@dFFIbje05CHc8000009UmSiEh;K7FDx-EEi*AOH8U_aGcYzZ zG&(moJUKT#IyXK#JU%=*Kt4Z3K|V!7KSn`6Mn*wKKS4=DLP|zONk~UcNJmacNKZ^l zQcg})P)}G@RasJ0SyfeBS5;eBRa;qCU0GOLRasqITVPy&Tw`BfW?x`sU}kG%W^QU} zZene9YixIJb9Hobc6D=jc6NPpcYk$vd3bh!cy@z%d4zmwJej*W(qfrylfjG2&;n~Rj4j+UQ~la!N?nvjs3kdvN~ zke`y1pOcq=oS2xLnUtZFm7$rJq?($el$oWLoTQeRq@A6onwqGbovN9hs+ymxoS&_q zovWarshpy&pQW;=rn9N2v7)H5qN%i|thJ@8x2deOuB*7It+=SJxvH+aue80ZvADIc zy|T5uvbMjlxxKlx!n3)>w7bT%yTiM|%eTPExWUU4yT#DI%GAQs+{@J2&)D7A^AOeAZA^8LW00930EC2ui01yBW000QL0RIUbIPea^g9n)y8G{hvj~Y(Ah-o+w z2oou2=xAy4=b)cHUBc|CqejXXI8)LL1jGjkmo<9WY-thXNf9b<1m+clmHJbY!DFw2E~6a8hAiKLdRo)P*9ZEae3en JB@_b!06Q_x4mtn; delta 801 zcmV++1K#}F2b&0gM@dFFIbje05CHc803;?QEHN-HGchhSGBP+cH99vmJ2*8wI5j*u zH#|8vJUTc)K0ZS|JVQS|L_t19L_$SEK}khINkl|RMny|UModUaP)$x#OiWWwOHoiz zS5i?|Qc_t|Q(0G3T2@tBR$E_JRa{tBTv%3JSy)_JSz%s(Twq;ZV_simU1DfoWolnx zW?^M*Xlie2Y<6vKc5G~RZgYBYaeH%ie|C9%dwhO=c7b|%fq8j_dw+<1eu#jAhJ}WS zh=+=ai;a$lkb{VmgNBldiIIqjm5Yp*i;kCzkC2azmX45{kCva0kDZW@oRX50larj2 zmYSE7pO%$>p^=rKla`^Em7+9?6?d|XJ?eOvN@bU5S@$vBT@bdEV^Yiog`1twx`T6?!`uh3%`}_R-{Qdp? z{{H?3{{R2~|Npa*0Sf_tA^8LV00000A^!_WZDD6+O<`wgV`~j(VQp<;JuogbH8eFf z04x9i000mG5C8xO+W<`o94K&+A58=k4pby%2^>cX2a+Nr1c#C^ZW@(J_{ox>BS^HU zsYAw2B2WWIF)9Q`%pX2)sFb0zCC?>Oq#^~f0!0oWG-F)om@?#l$sJRY`T)s+WzHHR zG6-0(5#)=ZM{It);1b776c`2qJYdlTk*PK*VkAkErOS*00uU@HF-YK~79jRiDRQI1 z00$8==-DXn&;=D|u24820Rsmbod}A;!vMtw1rnv|aB6CFZEtjHZg+2Qd2MZVaBqBYadvKTdT)4sZgF#S zb9ixbeRgzwaCLrlc7J$zeSC9(c6EStb%1$yg?W2}b9sSwe1LX(gMNF2czT6>eS>;^ zhkbj4fPI01eTjj8je&rOdw_|2f{cEJg@%EOfP#vIfsBHIjD&=XfQ5^NhmV4Uj)jDZ zii4Adgpq@Ul7@$qh=-Gngp`Phl7)zrg^QAkiIs_pmW+&)iiwzwik*&)nTd>N> zpQN&$pr)dste~W?p`x;)qOhl>u%V{0q^Gu~rn9J~w5h4FqpGr{tGA%3wWO}LrKz&2 zskN!9wymwTsjRlHtGcGDxT>qTtgX4It+=nPysNIfuCBVUvAn0Sx~j3htFphWw7##h zw6n0gu&}?gv%j^qy0o>vwz#~twZN{pz^}5wwYS2vw!*cx#kIJ@vAM#uyTq}&#kIZ0 zwz!@Rx6xxLA{zRSPD$+yGHxx&f5!p*qC&b`FSyT;4D#Ld0N(7DFazsl3U zz{JDC&%n#i!^qIV%GJWn)xyov%Ffov&)Le+*~rt}%hcD>)7aG3-_YRc+2rln<>=+= z?dAXg00000A^8LW00930EC2ui03ZM$000R80RIUbNU-3*W(E@~T$w{9t2c3ZGivgy9;t3noDRdqC0;OCG3}PA38XsBjF$9f6OD%`I07WUGWTTBAy0l`69fEuSfddYx0KyM(UJ;TTeiZsCk5r!PHPAJ$+;>s*WjKF{d5KPcP z2N{&`Llp(#0}TlefRRTa@q}Yb9%t;~iX|>aAi)G0Y@k60CDf46Hem>00w(07qsbXk zs1b-7DNF!?1Q(Pb0tRf-u+S|m1aJgA#K0lSA%-9lLj@L8puq(xxG;hSEJTD$3IjMX zN*=YK^GgdFR4{>)A*|2>4JBx@v_%90a1jkU@$j$#1{Hh|LkTOmKm!dfq>)iFUNkU( z8@l-L!3Gy#(83Ka$UwslH?Z)8M%@5WfB`9R5JIXaq)-D3EMU7s2r!|N0s#h$Fm4GX zq!2?4E9`)S3O@Zah6Vy?@IeSMq;SIyG{itdr~Up@!vhF#Py!1(_;AAvI?T}UKs}If v!VNw2a6=6sZ%j}kOau{f4K?&&azRk|aBU4jylhYvJ>;;h%{LqCQ$PSaldH2I literal 1544 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 V2;l}Sr~zXe0*)Op!KMKL06Pq``bz)+ literal 2391 zcmd^;>sOKq0*7DV1p!e3*_>wT>{!z|xwEb9&i)(w`}}-)&Ut>3QR2`rg+JgA zd;$P88pPnxc!G_stu4`kZZyKvHUoJmZi&^HB03MM|3DtIYJ& zjMVh3bk#S9RaseC1xjUZc6LF|*T;?&9M8$jKAMxCf224szo;PpWI^$F1w}>23r`l8 ze0QP{E-Ho#iZsO~_&rlz#~Om$UFb>-=@@;Yr*eR+9( zW!1Ur3Pa85<{EwDnYxzKXItxP&)3zp)*CK0G+Zz=wOlxN`CRjra~HeMH?%ijxN@Pj zr{(gs)~>;e-Gi+cJKI}(jUAnx?fvcT{oQ^2y;la?dxko$-M-Q_)ZKfd=i2Sw!TZ*k?5mZ1le*KdyAx@WobVCs%} z`o_q__oI*QO<3^Qaxo6Mk7Zw+uE&TL+>G8tLC(Cc1zk0i{{Q7UNR$jh-v+~QkpWnWFySn<@ zKYn}v`^S%KYo9)STKn?l3-JFs)<41jsk6S=M&&4!8M_tA%(N^!r6MOsvBQ6JP;gLi zFyQ+q^5^g7&$CQ|iW=%IfXWOKyO;FM6s_%A-emYuBx9z_?*ICuXZ-~oa;;iIW zzo2c|PphXW5zH?^n9F%9@?bu`75Nett8@I@IGi9#?SBa67I; zQs;Z{0XTO9SZFE)$4LvRntyA`QNYr zd-g(D{x9|`D=WC#2SKXj%t7}W=NL2eOrO<3ClO* z;d%?t&6DgVc;kFc@AfY|HMB6~RU2wz_l8E={;=ryseM;tQgtK@Q$-Jq;?#p5Cge%- z0ShC&Z&?i0EDczwyMqQW9uD2JI+sQ@xym&qxviX@_BmjRQ$^=5YGx?g2|^b{;m2M2?wHE+fqzq$!dWBIm3ivrd9J z$G+@Y-J&R?7K6tu8|x%5br8&ni=-olYO7IC)-~Al~m7X~HS>bDPdh zIb_w+BE3jrx<`=l9SB{8P>DY#ERQn;YF;O|n|XN>%KO}AvE_iI3g!vpz?gHz7|H0o z`%SIT(Tlq@j3mh9d|coyceGR1VyuPs1)q*HE9Y}pvEn(sm{IXrfu*F(TQN*UI4NbE zC@}#bWEe)+CddOs&d0*d=ps~Qs!d0xuN8^kn#?M9%H@#9p#m8x(nTrF7108?#v3U6 zc0cw_6iw>OY4J0wpxxJr&=88DGQk*T z-%*ejFNC-HH0f9(?17fHGF#t86N(Z;7?dz_33Xa};Y_Z@&ReoHj3S4xa?y=RMxHgo zpCt0eyk=>cp1Y)_zls;3@%CzFo|vJO#EM<=k`;XP-57`mQj`06=+ROD<=DYY$FoZ3 z04^9U<&{&5;y?W19FsmUO3qLToDcaU{vHLX$OZtjSq|fm0-!r_#EUUfxx*U*Hcs-Z zdJ==(=m@ODh@@Ve(bx)&2%81~!<~U~vLh&mcRWwm*~)Em!vG56F{rVX0_;`7x>$y! zOv|-2xf)3#URn!*G^A|c*am>-K%HfYg)j(0YBCj}>+xf8l{0)=wi?DtX0ZbSq&89@06VfJ1VOc}$wb$(L(TXVgFX^!!`NZf$PP#+5RQ=JR{@N#96`~j z(HuGgCp99SOiKn9Fd7rTT)~`MLI5hj@6#&ikPhe_YXNLcrDk6b7wxCw5#ps9uVD`5 zq)uSJc@1!30GND3!mz{XtWbmV9P?Uo#~S^Cy3Ac+{U0u9z@^xCZoUX=E+ m9fT$q1mQ4O^YjLleVjN#h=a@v5gba12`0Yida4G1?f(I3(_M!E diff --git a/version.py b/version.py index e99aefb5d..e3b876512 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = '2.23.4 f.LUM' +__version__ = '2.23.5 f.LUM' From 4ed414b61920bbd28671047aa36d393bc3fc84ff Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 22 Oct 2018 23:25:43 -0600 Subject: [PATCH 3/3] Fix closing console window in bundle --- Utils.py | 4 ++-- version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Utils.py b/Utils.py index 45ad7224f..201503325 100644 --- a/Utils.py +++ b/Utils.py @@ -62,9 +62,9 @@ def open_file(filename): def close_console(): if sys.platform == 'win32': #windows - import ctypes.wintypes + import win32gui, win32con try: - ctypes.windll.kernel32.FreeConsole() + win32gui.ShowWindow(win32gui.GetForegroundWindow(), win32con.SW_HIDE) except Exception: pass diff --git a/version.py b/version.py index e3b876512..e27481bf7 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = '2.23.5 f.LUM' +__version__ = '2.23.6 f.LUM'