diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
| commit | ccb5c0f324e2b9002a687c9111b2675bc6bd101d (patch) | |
| tree | 84d587d63154d9a8da3e9983aae2042f09767737 /data | |
| parent | 498ad1e6af6b219aa54b827e59325b6fbcb54343 (diff) | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into region_map
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_tasks.s | 22 | ||||
| -rw-r--r-- | data/field_weather.s | 3 | ||||
| -rw-r--r-- | data/maps/FourIsland_IcefallCave_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/overworld.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
5 files changed, 3 insertions, 28 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/field_weather.s b/data/field_weather.s index 090c19f6b..c8acca001 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -390,6 +390,3 @@ gUnknown_83C68B8:: gUnknown_83C68BC:: @ 83C68BC spr_template 4613, 4608, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 - -sFlashLevelPixelRadii:: @ 83C68D4 - .2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000 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/overworld.s b/data/overworld.s index b305b3002..245ee3696 100644 --- a/data/overworld.s +++ b/data/overworld.s @@ -97,7 +97,7 @@ gUnknown_826D320:: @ 826D320 @ .baseTile = 0x0000 @ } -gUnknown_826D330:: @ 826D330 +gFlashEffectParams:: @ 826D330 .4byte REG_WIN0H .4byte (2 >> 1) | ((DMA_16BIT | DMA_DEST_RELOAD | DMA_SRC_INC | DMA_REPEAT | DMA_START_HBLANK | DMA_ENABLE) << 16) .byte 1, 0 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 |