summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/macros/movement.inc16
-rw-r--r--asm/rom_header.inc35
2 files changed, 8 insertions, 43 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index e26a00d76..0220c11a9 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -43,18 +43,18 @@
create_movement_action walk_in_place_fast_up
create_movement_action walk_in_place_fast_left
create_movement_action walk_in_place_fast_right
- create_movement_action walk_in_place_fastest_down
- create_movement_action walk_in_place_fastest_up
- create_movement_action walk_in_place_fastest_left
- create_movement_action walk_in_place_fastest_right
+ create_movement_action walk_in_place_faster_down
+ create_movement_action walk_in_place_faster_up
+ create_movement_action walk_in_place_faster_left
+ create_movement_action walk_in_place_faster_right
create_movement_action ride_water_current_down
create_movement_action ride_water_current_up
create_movement_action ride_water_current_left
create_movement_action ride_water_current_right
- create_movement_action walk_fastest_down
- create_movement_action walk_fastest_up
- create_movement_action walk_fastest_left
- create_movement_action walk_fastest_right
+ create_movement_action walk_faster_down
+ create_movement_action walk_faster_up
+ create_movement_action walk_faster_left
+ create_movement_action walk_faster_right
create_movement_action slide_down
create_movement_action slide_up
create_movement_action slide_left
diff --git a/asm/rom_header.inc b/asm/rom_header.inc
deleted file mode 100644
index 6730efae2..000000000
--- a/asm/rom_header.inc
+++ /dev/null
@@ -1,35 +0,0 @@
- .global RomHeaderNintendoLogo
-RomHeaderNintendoLogo:
- .space 156
-
-RomHeaderGameTitle:
- .space 12
-
- .global RomHeaderGameCode
-RomHeaderGameCode:
- .space 4
-
-RomHeaderMakerCode:
- .space 2
-
-RomHeaderMagic:
- .byte 0
-
-RomHeaderMainUnitCode:
- .byte 0
-
-RomHeaderDeviceType:
- .byte 0
-
-RomHeaderReserved1:
- .space 7
-
- .global RomHeaderSoftwareVersion
-RomHeaderSoftwareVersion:
- .byte 0
-
-RomHeaderChecksum:
- .byte 0
-
-RomHeaderReserved2:
- .space 2