diff options
| -rw-r--r-- | diff.sh | 7 | ||||
| -rw-r--r-- | include/roulette.h | 3 | ||||
| -rw-r--r-- | ld_script.txt | 4 | ||||
| -rw-r--r-- | src/roulette.c | 16 |
4 files changed, 5 insertions, 25 deletions
diff --git a/diff.sh b/diff.sh deleted file mode 100644 index a4b465b6e..000000000 --- a/diff.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" -OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" -$OBJDUMP $OPTIONS baserom.gba > baserom.dump -$OBJDUMP $OPTIONS pokeruby.gba > pokeruby.dump -diff baserom.dump pokeruby.dump diff --git a/include/roulette.h b/include/roulette.h index 9cf0ba1d2..7d114a073 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -33,9 +33,6 @@ struct UnkStruct0 s16 sub_81174C4(s16, s16); s16 sub_81174E0(s16); - void PlayRoulette(void); - - #endif diff --git a/ld_script.txt b/ld_script.txt index e194a8dfb..d2586f3c3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -336,7 +336,7 @@ SECTIONS { src/battle/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/scene/evolution_scene.o(.text); - src/roulette.o(.text); + src/roulette.o(.text); asm/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/pokemon/pokedex_cry_screen.o(.text); @@ -349,7 +349,7 @@ SECTIONS { src/battle/battle_message.o(.text); src/field/choose_party.o(.text); asm/cable_car.o(.text); - src/roulette_util.o(.text); + src/roulette_util.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/unused_8124F94.o(.text); diff --git a/src/roulette.c b/src/roulette.c index 36c15bf23..1d612d071 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1,8 +1,7 @@ #include "global.h" - #include "ewram.h" #include "field_fadetransition.h" -#include "game_stat.h" +#include "constants/game_stat.h" #include "m4a.h" #include "main.h" #include "menu.h" @@ -11,14 +10,13 @@ #include "overworld.h" #include "palette.h" #include "pokemon.h" -#include "rng.h" #include "roulette.h" #include "roulette_util.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "strings2.h" #include "string_util.h" @@ -29,14 +27,6 @@ asm(".include \"constants/gba_constants.inc\""); -struct OamMatrix -{ - s16 a; - s16 b; - s16 c; - s16 d; -}; - struct Roulette /* ewram + 0x19000 */ { u8 var00; |