diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-22 14:40:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 14:40:50 -0500 |
| commit | abe56579c107af58e6f3a43968ba2257ff358189 (patch) | |
| tree | ae8b623235853a91b1ed06c40a34e4074c0a9ee7 /data | |
| parent | 768a68d3e8d09b0f244047c2b75cf47a3a713ff9 (diff) | |
| parent | 253de64e63adc90043bdbc26b5bd90b8b0115658 (diff) | |
Merge pull request #622 from huderlem/ereader
Finish decompiling ereader and faraway island code
Diffstat (limited to 'data')
| -rw-r--r-- | data/ereader_helpers.s (renamed from data/ereader.s) | 9 | ||||
| -rwxr-xr-x | data/ereader_screen.s | 7 | ||||
| -rw-r--r-- | data/maps/FarawayIsland_Interior/scripts.inc | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/data/ereader.s b/data/ereader_helpers.s index 5fbab5c3a..0ddddbc08 100644 --- a/data/ereader.s +++ b/data/ereader_helpers.s @@ -46,12 +46,3 @@ gUnknown_08625B6C:: @ 8625B6C .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10 .byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01 .byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - -gUnknown_0862608C:: @ 862608C - .2byte 21, 16 - .2byte 25, 16 - .2byte 16, 17 - .2byte 20, 20 - -gUnknown_0862609C:: @ 862609C - .incbin "data/unknown_jp_62609C.bin" diff --git a/data/ereader_screen.s b/data/ereader_screen.s new file mode 100755 index 000000000..3d6572a49 --- /dev/null +++ b/data/ereader_screen.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_0862609C:: @ 862609C + .incbin "data/unknown_jp_62609C.bin" diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index bee33ae07..fe180184b 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 - setvar VAR_NEVER_READ_0x403A, 0 + setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 end |