diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-06 13:35:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 13:35:48 -0500 |
| commit | 26f7ba482384ad4f63063797a527b7fb33572aa1 (patch) | |
| tree | df807e701efce9007c5ae8cb7583c0375a3c6f14 /data | |
| parent | ab4fa0e76e4478804266cddf6604308a77cdcb3b (diff) | |
| parent | da2ff948a68548a44a0e0d48f869f2217ce06e2d (diff) | |
Merge pull request #204 from mrgriffin/field-screen-effect
Decompile field_screen_effect
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_weather.s | 3 | ||||
| -rw-r--r-- | data/overworld.s | 2 |
2 files changed, 1 insertions, 4 deletions
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/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 |