diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-06 13:34:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 13:34:09 -0500 |
| commit | ab4fa0e76e4478804266cddf6604308a77cdcb3b (patch) | |
| tree | 038ca78f1ebf0a1f9f10a6f15f850ecb7d3376c7 /data | |
| parent | 4d7a5b165f96dd1788364523eb160041157d3004 (diff) | |
| parent | 5c9114a245a3e29cb43323a33b27e1f2943107db (diff) | |
Merge pull request #203 from mrgriffin/field-tasks
Decompile field_tasks
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_tasks.s | 22 | ||||
| -rw-r--r-- | data/maps/FourIsland_IcefallCave_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 2 insertions, 24 deletions
diff --git a/data/field_tasks.s b/data/field_tasks.s deleted file mode 100644 index 2ff9ad215..000000000 --- a/data/field_tasks.s +++ /dev/null @@ -1,22 +0,0 @@ - .section .rodata - .align 2 -gUnknown_83A7310:: @ 83A7310 - .4byte nullsub_40 - .4byte sub_806EB54 - .4byte nullsub_40 - .4byte nullsub_40 - .4byte sub_806E9E0 - .4byte nullsub_40 - .4byte nullsub_40 - .4byte sub_806EC40 - -gUnknown_83A7330:: @ 83A7330 - .byte 0x08, 0x03 - .byte 0x0a, 0x05 - .byte 0x0f, 0x05 - .byte 0x08, 0x09 - .byte 0x09, 0x09 - .byte 0x10, 0x09 - .byte 0x08, 0x0a - .byte 0x09, 0x0a - .byte 0x08, 0x0e diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 451541b8c..1c3d8da1f 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54 end FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57 - special sub_806E99C + special Special_SetIcefallCaveCrackedIceMetatiles end FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B diff --git a/data/specials.inc b/data/specials.inc index 74ba0c849..f7ca055ef 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -317,7 +317,7 @@ gSpecials:: @ 815FD60 def_special Special_DrawElevatorCurrentFloorWindow def_special nullsub_75 def_special Special_CheckPartyPokerus - def_special sub_806E99C + def_special Special_SetIcefallCaveCrackedIceMetatiles def_special Special_ShakeScreen def_special Special_StartGroudonKyogreBattle def_special Special_StartLegendaryBattle |