diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-12 15:01:43 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-12 15:01:43 +0100 |
| commit | 382442c4c8754262c77acb50930df31c63a62355 (patch) | |
| tree | bbd8da8d388b0df552b391452d4d150b40c47480 /data | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
start decompiling overworld.s
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 6 | ||||
| -rw-r--r-- | data/overworld.s | 52 |
2 files changed, 3 insertions, 55 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b2b895903..7b9d6519c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1287,12 +1287,12 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 setvar VAR_0x40D3, 1 return -EverGrandeCity_HallOfFame_EventScript_271857:: @ 8271857 +EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_2718CC - goto EverGrandeCity_HallOfFame_EventScript_271862 + goto EventScript_271862 end -EverGrandeCity_HallOfFame_EventScript_271862:: @ 8271862 +EventScript_271862:: @ 8271862 compare VAR_0x4096, 1 goto_eq EverGrandeCity_HallOfFame_EventScript_271884 compare VAR_0x4096, 2 diff --git a/data/overworld.s b/data/overworld.s deleted file mode 100644 index 186af6f44..000000000 --- a/data/overworld.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 -gUnknown_08339D3C:: @ 8339D3C - .4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C - -gUnknown_08339D64:: @ 8339D64 - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - -gUnknown_08339DAC:: @ 8339DAC - .4byte 0x1F8 - .4byte 0x11D1 - .4byte 0x21C2 - .4byte 0x31E3 - -gUnknown_08339DBC:: @ 8339DBC - .4byte REG_WIN0H - .4byte 0xa2600001 - .byte 1, 0 - - .align 2 -gUnknown_08339DC8:: @ 8339DC8 - .4byte sub_80879D8 - .4byte sub_80879F8 - .4byte sub_80879FC - -gUnknown_08339DD4:: @ 8339DD4 - .4byte sub_8087A1C - .4byte sub_8087A20 - .4byte sub_8087A20 - .4byte sub_8087A20 - .4byte sub_8087A20 - .4byte sub_8087A1C - .4byte sub_8087A1C - .4byte sub_8087A88 - .4byte sub_8087A88 - .4byte sub_8087A88 - .4byte sub_8087A88 - -gUnknown_08339E00:: @ 8339E00 - .4byte sub_8087AA0 - .4byte sub_8087AA8 |