dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dump more map event scripts

Browse Source
This commit is contained in:
garak
2019-10-16 12:31:32 -04:00
parent 1beeb4d782
commit 705138c224
5 changed files with 9419 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+2 -2
View File
@@ -1670,10 +1670,10 @@ _0806D5A4:
_0806D5D0: .4byte 0x00000826 _0806D5D0: .4byte 0x00000826
_0806D5D4: .4byte gUnknown_81BE2B7 _0806D5D4: .4byte gUnknown_81BE2B7
_0806D5D8: _0806D5D8:
ldr r0, _0806D5DC @ =gUnknown_81BE2FF ldr r0, _0806D5DC @ =EventScript_81BE2FF
b _0806D5E2 b _0806D5E2
.align 2, 0 .align 2, 0
_0806D5DC: .4byte gUnknown_81BE2FF _0806D5DC: .4byte EventScript_81BE2FF
_0806D5E0: _0806D5E0:
movs r0, 0 movs r0, 0
_0806D5E2: _0806D5E2:
asm/macros/movement.inc
+2
View File
@@ -110,6 +110,8 @@
create_movement step_65 create_movement step_65
create_movement step_66 create_movement step_66
create_movement step_67 create_movement step_67
create_movement step_68
create_movement step_69
enum_start 0x91 enum_start 0x91
create_movement step_91 create_movement step_91
asm/overworld.s
+2 -2
View File
@@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214
thumb_func_start sub_8058230 thumb_func_start sub_8058230
sub_8058230: @ 8058230 sub_8058230: @ 8058230
push {lr} push {lr}
ldr r0, _08058240 @ =gUnknown_81BB9F0 ldr r0, _08058240 @ =EventScript_1BB9F0
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
bl ScriptContext2_Enable bl ScriptContext2_Enable
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08058240: .4byte gUnknown_81BB9F0 _08058240: .4byte EventScript_1BB9F0
thumb_func_end sub_8058230 thumb_func_end sub_8058230
thumb_func_start sub_8058244 thumb_func_start sub_8058244
data/map_event_scripts.inc
+9412 -1583
View File
File diff suppressed because it is too large Load Diff
include/constants/flags.h
+1
View File
@@ -5,6 +5,7 @@
#define FLAG_SYS_SAFARI_MODE 0x800 #define FLAG_SYS_SAFARI_MODE 0x800
#define FLAG_WHITE_FLUTE_ACTIVE 0x803 #define FLAG_WHITE_FLUTE_ACTIVE 0x803
#define FLAG_BLACK_FLUTE_ACTIVE 0x804 #define FLAG_BLACK_FLUTE_ACTIVE 0x804
#define FLAG_0x805 0x805
// World Map Flags // World Map Flags
#define FLAG_WORLD_MAP_PALLET_TOWN 0x890 #define FLAG_WORLD_MAP_PALLET_TOWN 0x890