more overworlds

bpre.sym

@@ -71,6 +71,8 @@ superstate = 0x030030F0;
 
 fade_controller = 0x02037AB8;
 
+npc_states = 0x02036E38;
+
 weather_turns = 0x02023F48;
 battle_type_flags = 0x02022B4C;
 battle_active_bank = 0x02023BC4;
@@ -97,7 +99,7 @@ battle_stat_changer = 0x02023FDE;
 battle_menu_chosen_item = 0x02023D7C;
 battle_stuff_ptr = 0x02023FE8;
 battle_enigma_berry = 0x02023F54;
-battle_turn_random = 0x02033e80;
+battle_turn_random = 0x02023e80;
 side_affecting_halfword = 0x2023DDE;
 
 item_get_quality = 0x0809A948|1;

main.asm

@@ -29,6 +29,8 @@
 .include "patches/pokemon_data/pokemon_icons.asm"
 .include "patches/pokemon_data/pokemon_habitats.asm"
 
+.include "patches/overworlds/overworld.asm"
+
 .include "patches/battle_engine/malloc.asm"
 .include "patches/battle_engine/battle_engine.asm"
 

makefile

@@ -13,7 +13,7 @@ export PATH := $(realpath ../tools):$(PATH)
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 ASFLAGS   := -mthumb
-CFLAGS    := -g -mthumb -mno-thumb-interwork -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include $(DEFINES)
+CFLAGS    := -mthumb -mno-thumb-interwork -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object

nbproject/configurations.xml

@@ -3773,6 +3773,9 @@
           <in>items.asm</in>
           <in>tm_fixes.asm</in>
         </df>
+        <df name="overworlds">
+          <in>overworld.asm</in>
+        </df>
         <df name="pokemon_data">
           <in>altitude_table.asm</in>
           <in>enemy_y_table.asm</in>
@@ -3799,6 +3802,7 @@
         <in>disable_cry_table_blocks.s</in>
         <in>dynamic_overworld_hooks.asm</in>
         <in>hooks.asm</in>
+        <in>move_table.asm</in>
         <in>moves.asm</in>
         <in>music.asm</in>
         <in>special.asm</in>
@@ -4663,6 +4667,10 @@
           <in>main_mixer.S</in>
           <in>music_override.c</in>
         </df>
+        <df name="overworld">
+          <in>overworld.c</in>
+          <in>overworld_hooks.S</in>
+        </df>
         <df name="player_interaction">
           <in>jump_behavior.S</in>
           <in>on_step.S</in>
@@ -23419,10 +23427,14 @@
       </item>
       <item path="patches/items/tm_fixes.asm" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="patches/move_table.asm" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="patches/moves.asm" ex="false" tool="4" flavor2="0">
       </item>
       <item path="patches/music.asm" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="patches/overworlds/overworld.asm" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="patches/pokemon_data/altitude_table.asm"
             ex="false"
             tool="4"
@@ -27328,6 +27340,10 @@
       </item>
       <item path="src/music/music_override.c" ex="false" tool="0" flavor2="0">
       </item>
+      <item path="src/overworld/overworld.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="src/overworld/overworld_hooks.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/player_interaction/jump_behavior.S"
             ex="false"
             tool="4"

nbproject/private/configurations.xml

@@ -3824,6 +3824,8 @@
           </df>
           <df name="music">
           </df>
+          <df name="overworld">
+          </df>
           <df name="player_interaction">
           </df>
           <df name="savefile">
@@ -3848,6 +3850,9 @@
           <in>items.asm</in>
           <in>tm_fixes.asm</in>
         </df>
+        <df name="overworlds">
+          <in>overworld.asm</in>
+        </df>
         <df name="pokemon_data">
           <in>altitude_table.asm</in>
           <in>enemy_y_table.asm</in>
@@ -3874,6 +3879,7 @@
         <in>disable_cry_table_blocks.s</in>
         <in>dynamic_overworld_hooks.asm</in>
         <in>hooks.asm</in>
+        <in>move_table.asm</in>
         <in>moves.asm</in>
         <in>music.asm</in>
         <in>special.asm</in>
@@ -5564,6 +5570,10 @@
           <in>main_mixer.S</in>
           <in>music_override.c</in>
         </df>
+        <df name="overworld">
+          <in>overworld.c</in>
+          <in>overworld_hooks.S</in>
+        </df>
         <df name="player_interaction">
           <in>jump_behavior.S</in>
           <in>on_step.S</in>

patches/move_table.asm

@@ -0,0 +1,282 @@
+.org 0x080001CC
+.word move_table
+.org 0x0800E3D8
+.word move_table
+.org 0x080128CC
+.word move_table
+.org 0x08012BA4
+.word move_table
+.org 0x08015060
+.word move_table
+.org 0x08015FBC
+.word move_table
+.org 0x080160F0
+.word move_table
+.org 0x08016238
+.word move_table
+.org 0x08016368
+.word move_table
+.org 0x080176D8
+.word move_table
+.org 0x08017990
+.word move_table
+.org 0x08019544
+.word move_table
+.org 0x080197A4
+.word move_table
+.org 0x08019BF0
+.word move_table
+.org 0x0801A0D0
+.word move_table
+.org 0x0801A6E8
+.word move_table
+.org 0x0801A740
+.word move_table
+.org 0x0801AA40
+.word move_table
+.org 0x0801AB0C
+.word move_table
+.org 0x0801AC00
+.word move_table
+.org 0x0801ACDC
+.word move_table
+.org 0x0801ADB8
+.word move_table
+.org 0x0801AE8C
+.word move_table
+.org 0x0801AFF8
+.word move_table
+.org 0x0801CF00
+.word move_table
+.org 0x0801D098
+.word move_table
+.org 0x0801D29C
+.word move_table
+.org 0x0801D934
+.word move_table
+.org 0x0801D9D0
+.word move_table
+.org 0x0801DA90
+.word move_table
+.org 0x0801DBF0
+.word move_table
+.org 0x0801DC6C
+.word move_table
+.org 0x0801DDB4
+.word move_table
+.org 0x0801DE68
+.word move_table
+.org 0x0801DF88
+.word move_table
+.org 0x0801E100
+.word move_table
+.org 0x0801E1A8
+.word move_table
+.org 0x0801E288
+.word move_table
+.org 0x0801E4D8
+.word move_table
+.org 0x0801E680
+.word move_table
+.org 0x0801E768
+.word move_table
+.org 0x0801E7F0
+.word move_table
+.org 0x0801E830
+.word move_table
+.org 0x0801E910
+.word move_table
+.org 0x0801EA9C
+.word move_table
+.org 0x0801EAFC
+.word move_table
+.org 0x0801ED30
+.word move_table
+.org 0x0801EDB4
+.word move_table
+.org 0x0801EDE4
+.word move_table
+.org 0x0801EE94
+.word move_table
+.org 0x0801EFC8
+.word move_table
+.org 0x0801F030
+.word move_table
+.org 0x0801F0C4
+.word move_table
+.org 0x0801F258
+.word move_table
+.org 0x0801F53C
+.word move_table
+.org 0x0801F750
+.word move_table
+.org 0x08021158
+.word move_table
+.org 0x08021190
+.word move_table
+.org 0x0802334C
+.word move_table
+.org 0x08023490
+.word move_table
+.org 0x0802393C
+.word move_table
+.org 0x08023B14
+.word move_table
+.org 0x08023C20
+.word move_table
+.org 0x08023C9C
+.word move_table
+.org 0x08023E6C
+.word move_table
+.org 0x080240C4
+.word move_table
+.org 0x08025CFC
+.word move_table
+.org 0x08026100
+.word move_table
+.org 0x0802704C
+.word move_table
+.org 0x08027468
+.word move_table
+.org 0x080286A0
+.word move_table
+.org 0x08028744
+.word move_table
+.org 0x08028A6C
+.word move_table
+.org 0x08028B4C
+.word move_table
+.org 0x08029434
+.word move_table
+.org 0x080296AC
+.word move_table
+.org 0x080297F4
+.word move_table
+.org 0x0802A180
+.word move_table
+.org 0x0802A1F0
+.word move_table
+.org 0x0802A27C
+.word move_table
+.org 0x0802AD00
+.word move_table
+.org 0x0802AE18
+.word move_table
+.org 0x0802AE50
+.word move_table
+.org 0x0802BAC0
+.word move_table
+.org 0x0802BE84
+.word move_table
+.org 0x0802C6C0
+.word move_table
+.org 0x0802D014
+.word move_table
+.org 0x0802E8B4
+.word move_table
+.org 0x0802E9F4
+.word move_table
+.org 0x0802EA9C
+.word move_table
+.org 0x080309C0
+.word move_table
+.org 0x08033B40
+.word move_table
+.org 0x08038670
+.word move_table
+.org 0x080386BC
+.word move_table
+.org 0x0803941C
+.word move_table
+.org 0x08039468
+.word move_table
+.org 0x0803962C
+.word move_table
+.org 0x080398C4
+.word move_table
+.org 0x0803A194
+.word move_table
+.org 0x0803E94C
+.word move_table
+.org 0x0803E9D0
+.word move_table
+.org 0x0803EC3C
+.word move_table
+.org 0x0803ECE8
+.word move_table
+.org 0x0803ED3C
+.word move_table
+.org 0x0803ED60
+.word move_table
+.org 0x0803F254
+.word move_table
+.org 0x0803F3B4
+.word move_table
+.org 0x0803F510
+.word move_table
+.org 0x0804105C
+.word move_table
+.org 0x080C7D90
+.word move_table
+.org 0x080C7E00
+.word move_table
+.org 0x080C7F34
+.word move_table
+.org 0x080C7F5C
+.word move_table
+.org 0x080C80AC
+.word move_table
+.org 0x080C8414
+.word move_table
+.org 0x080C8924
+.word move_table
+.org 0x080C8970
+.word move_table
+.org 0x080C8BD4
+.word move_table
+.org 0x080C8CBC
+.word move_table
+.org 0x080C8F2C
+.word move_table
+.org 0x080C8FA4
+.word move_table
+.org 0x080C9030
+.word move_table
+.org 0x080C9084
+.word move_table
+.org 0x080C946C
+.word move_table
+.org 0x080C9498
+.word move_table
+.org 0x080C94C4
+.word move_table
+.org 0x080E5380
+.word move_table
+.org 0x080E53CC
+.word move_table
+.org 0x080E543C
+.word move_table
+.org 0x081334D8
+.word move_table
+.org 0x08133528
+.word move_table
+.org 0x081335AC
+.word move_table
+.org 0x081336F0
+.word move_table
+.org 0x08133878
+.word move_table
+.org 0x08136950
+.word move_table
+.org 0x08136A64
+.word move_table
+.org 0x08136AB4
+.word move_table
+.org 0x0803E8F8
+.word move_table+4
+.org 0x0803E9A0
+.word move_table+4
+.org 0x08040EE0
+.word move_table+4
+
+

patches/moves.asm

@@ -100,285 +100,4 @@
 
 //move table
 
-.org 0x080001CC
-.word move_table
-.org 0x0800E3D8
-.word move_table
-.org 0x080128CC
-.word move_table
-.org 0x08012BA4
-.word move_table
-.org 0x08015060
-.word move_table
-.org 0x08015FBC
-.word move_table
-.org 0x080160F0
-.word move_table
-.org 0x08016238
-.word move_table
-.org 0x08016368
-.word move_table
-.org 0x080176D8
-.word move_table
-.org 0x08017990
-.word move_table
-.org 0x08019544
-.word move_table
-.org 0x080197A4
-.word move_table
-.org 0x08019BF0
-.word move_table
-.org 0x0801A0D0
-.word move_table
-.org 0x0801A6E8
-.word move_table
-.org 0x0801A740
-.word move_table
-.org 0x0801AA40
-.word move_table
-.org 0x0801AB0C
-.word move_table
-.org 0x0801AC00
-.word move_table
-.org 0x0801ACDC
-.word move_table
-.org 0x0801ADB8
-.word move_table
-.org 0x0801AE8C
-.word move_table
-.org 0x0801AFF8
-.word move_table
-.org 0x0801CF00
-.word move_table
-.org 0x0801D098
-.word move_table
-.org 0x0801D29C
-.word move_table
-.org 0x0801D934
-.word move_table
-.org 0x0801D9D0
-.word move_table
-.org 0x0801DA90
-.word move_table
-.org 0x0801DBF0
-.word move_table
-.org 0x0801DC6C
-.word move_table
-.org 0x0801DDB4
-.word move_table
-.org 0x0801DE68
-.word move_table
-.org 0x0801DF88
-.word move_table
-.org 0x0801E100
-.word move_table
-.org 0x0801E1A8
-.word move_table
-.org 0x0801E288
-.word move_table
-.org 0x0801E4D8
-.word move_table
-.org 0x0801E680
-.word move_table
-.org 0x0801E768
-.word move_table
-.org 0x0801E7F0
-.word move_table
-.org 0x0801E830
-.word move_table
-.org 0x0801E910
-.word move_table
-.org 0x0801EA9C
-.word move_table
-.org 0x0801EAFC
-.word move_table
-.org 0x0801ED30
-.word move_table
-.org 0x0801EDB4
-.word move_table
-.org 0x0801EDE4
-.word move_table
-.org 0x0801EE94
-.word move_table
-.org 0x0801EFC8
-.word move_table
-.org 0x0801F030
-.word move_table
-.org 0x0801F0C4
-.word move_table
-.org 0x0801F258
-.word move_table
-.org 0x0801F53C
-.word move_table
-.org 0x0801F750
-.word move_table
-.org 0x08021158
-.word move_table
-.org 0x08021190
-.word move_table
-.org 0x0802334C
-.word move_table
-.org 0x08023490
-.word move_table
-.org 0x0802393C
-.word move_table
-.org 0x08023B14
-.word move_table
-.org 0x08023C20
-.word move_table
-.org 0x08023C9C
-.word move_table
-.org 0x08023E6C
-.word move_table
-.org 0x080240C4
-.word move_table
-.org 0x08025CFC
-.word move_table
-.org 0x08026100
-.word move_table
-.org 0x0802704C
-.word move_table
-.org 0x08027468
-.word move_table
-.org 0x080286A0
-.word move_table
-.org 0x08028744
-.word move_table
-.org 0x08028A6C
-.word move_table
-.org 0x08028B4C
-.word move_table
-.org 0x08029434
-.word move_table
-.org 0x080296AC
-.word move_table
-.org 0x080297F4
-.word move_table
-.org 0x0802A180
-.word move_table
-.org 0x0802A1F0
-.word move_table
-.org 0x0802A27C
-.word move_table
-.org 0x0802AD00
-.word move_table
-.org 0x0802AE18
-.word move_table
-.org 0x0802AE50
-.word move_table
-.org 0x0802BAC0
-.word move_table
-.org 0x0802BE84
-.word move_table
-.org 0x0802C6C0
-.word move_table
-.org 0x0802D014
-.word move_table
-.org 0x0802E8B4
-.word move_table
-.org 0x0802E9F4
-.word move_table
-.org 0x0802EA9C
-.word move_table
-.org 0x080309C0
-.word move_table
-.org 0x08033B40
-.word move_table
-.org 0x08038670
-.word move_table
-.org 0x080386BC
-.word move_table
-.org 0x0803941C
-.word move_table
-.org 0x08039468
-.word move_table
-.org 0x0803962C
-.word move_table
-.org 0x080398C4
-.word move_table
-.org 0x0803A194
-.word move_table
-.org 0x0803E94C
-.word move_table
-.org 0x0803E9D0
-.word move_table
-.org 0x0803EC3C
-.word move_table
-.org 0x0803ECE8
-.word move_table
-.org 0x0803ED3C
-.word move_table
-.org 0x0803ED60
-.word move_table
-.org 0x0803F254
-.word move_table
-.org 0x0803F3B4
-.word move_table
-.org 0x0803F510
-.word move_table
-.org 0x0804105C
-.word move_table
-.org 0x080C7D90
-.word move_table
-.org 0x080C7E00
-.word move_table
-.org 0x080C7F34
-.word move_table
-.org 0x080C7F5C
-.word move_table
-.org 0x080C80AC
-.word move_table
-.org 0x080C8414
-.word move_table
-.org 0x080C8924
-.word move_table
-.org 0x080C8970
-.word move_table
-.org 0x080C8BD4
-.word move_table
-.org 0x080C8CBC
-.word move_table
-.org 0x080C8F2C
-.word move_table
-.org 0x080C8FA4
-.word move_table
-.org 0x080C9030
-.word move_table
-.org 0x080C9084
-.word move_table
-.org 0x080C946C
-.word move_table
-.org 0x080C9498
-.word move_table
-.org 0x080C94C4
-.word move_table
-.org 0x080E5380
-.word move_table
-.org 0x080E53CC
-.word move_table
-.org 0x080E543C
-.word move_table
-.org 0x081334D8
-.word move_table
-.org 0x08133528
-.word move_table
-.org 0x081335AC
-.word move_table
-.org 0x081336F0
-.word move_table
-.org 0x08133878
-.word move_table
-.org 0x08136950
-.word move_table
-.org 0x08136A64
-.word move_table
-.org 0x08136AB4
-.word move_table
-.org 0x0803E8F8
-.word move_table+4
-.org 0x0803E9A0
-.word move_table+4
-.org 0x08040EE0
-.word move_table+4
-
 //end of move table

patches/overworlds/overworld.asm

@@ -0,0 +1,61 @@
+.org 0x0805E5D4
+    bx r1
+
+.org 0x0805E5F4
+    .word overworld_h_one+1
+
+.org 0x0805F2C8
+    ldr r1, =npc_get_type+1
+    bx r1
+    .pool
+
+.org 0x0805e152
+mov r1, #5
+orr r0, r1
+strb r0, [r4]
+ldrb r0, [r5, #3]
+strb r0, [r4, #0x1A]
+
+.org 0x0805E510
+    ldr r1, =overworld_h_two+1
+    bx r1
+    .pool
+
+.org 0x0805E744
+    lsl r4, r4, #0x10
+    lsr r4, r4, #0x10
+    lsl r5, r5, #0x10
+    lsr r5, r5, #0x10
+    mov r0, #0x0
+    str r0, [SP, #0x20] 
+    mov r1, r9
+    ldrb r0, [r1, #0x1]
+    ldrb r1, [r1, #0x3]
+    lsl r1, r1, #0x18
+    lsr r1, r1, #0x10
+    orr r0, r1
+
+.org 0x0805e964
+    ldr r4, =overworld_h_three+1
+    bx r4
+    .pool
+
+.org 0x0805E8F0
+    lsl r0, #0x10
+    lsr r0, #0x10
+
+.org 0x0805ee84
+    bx r1
+
+.org 0x0805EFE4
+    .word overworld_h_four+1
+
+.org 0x08067A12
+    ldr r5, =overworld_h_five+1
+    bx r5
+    .pool
+
+.org 0x08067F92
+    ldr r5, =overworld_h_six+1
+    bx r5
+    .pool

src/overworld/overworld.c

@@ -0,0 +1,38 @@
+#include <bpre.h>
+
+#define OW_REPLACE_VAR  0x500A
+#define OW_REPLACE_TO_VAR   0x500B
+
+struct coords16{
+    u16 x;
+    u16 y;
+};
+
+struct npc_type {
+    u16 tiles_tag;
+    u16 pal_num;
+    u16 pal_tag_2;
+    u16 field_6;
+    struct coords16 pos_neg_center;
+    u8 pal_slot_unk;
+    u8 field_D;
+    u16 pal_table;
+    u32 oam;
+    u32 field_14;
+    u32 image_anims;
+    u32 gfx_table;
+    u32 rot_scale_anims;
+};
+
+struct npc_type** npc_tables[] = {(struct npc_type**)0x0839FDB0, (struct npc_type**)0x09E00000};
+
+struct npc_type* npc_get_type(u16 npc_id)
+{
+    u16* replace_ow = var_access(OW_REPLACE_VAR);
+    if(*replace_ow > 0 && *replace_ow - 1 == npc_id)
+    {
+        npc_id = *var_access(OW_REPLACE_TO_VAR);
+    }
+    u8 table = (npc_id >> 8);
+    return (npc_tables[table][npc_id & 0xFF]);
+}

src/overworld/overworld_hooks.S

@@ -0,0 +1,102 @@
+.align 2
+.thumb
+.text
+
+.global overworld_h_one
+
+overworld_h_one:
+    ldr r1, =npc_states
+    add r5, r0, r1
+    ldrb r0, [r5, #5] @image number
+    ldrb r1, [r5, #0x1A] @table index
+    lsl r1, #8
+    orr r0, r1
+    bl npc_get_type
+    ldr r1, =0x0805E5DD
+    bx r1
+
+.global overworld_h_two
+
+overworld_h_two:
+    push {r4, lr}
+    sub sp, #8
+    add r4, r0, #0
+    ldrb r0, [r4, #5] @image number
+    ldrb r1, [r4, #0x1A] @table index
+    lsl r1, #8
+    orr r0, r1
+    bl npc_get_type
+    ldr r1, =0x0805e51D
+    bx r1
+    
+.global overworld_h_three
+overworld_h_three:
+    add r4, r0, #0x0
+    add r5, r1, #0x0
+    add r3, r2, #0x0
+    ldrb r0, [r4, #0x1]
+    lsl r0, r0, #0x18
+    lsr r0, r0, #0x18
+    ldrb r1, [r4, #0x3]
+    lsl r1, r1, #0x18
+    lsr r1, r1, #0x10
+    orr r0, r0, r1
+    ldrb r1, [r4, #0x9]
+    add r2, r5, #0x0
+    ldr r4, =0x0805e96f
+    bx r4
+
+.global overworld_h_four
+overworld_h_four:
+    ldr r6, =npc_states
+    add r6, r0
+    mov r0, #0
+    str r0, [sp, #0x20]
+    ldrb r0, [r6, #5]
+    ldrb r1, [r6, #0x1A]
+    lsl r1, #8
+    orr r0, r1
+    bl npc_get_type
+    add r5, r0, #0x0
+    ldrh r2, [r5, #0x6]
+    add r4, SP, #0x18
+    ldr r0, [r4, #0x4]
+    lsr r0, r0, #0x10
+    lsl r0, r0, #0x10
+    orr r0, r2
+    str r0, [r4, #0x4]
+    ldrb r0, [r6, #0x5] 
+    ldrb r1, [r6, #0x1a]
+    lsl r1, r1, #0x8
+    orr r0, r1
+    ldr r1, =0x0805eea3
+    bx r1
+
+.global overworld_h_five
+overworld_h_five:
+    add r5, r0, #0
+    add r4, r1, #0
+    ldrb r1, [r5, #1]
+    mov r0, #0x41
+    neg r0, r0
+    and r0, r1
+    strb r0, [r5,#1]
+    ldrb r0, [r5, #0x5]
+    ldrb r1, [r5, #0x1a]
+    lsl r1, r1, #0x8
+    orr r0, r1
+    bl npc_get_type
+    ldr r1, =0x08067A27
+    bx r1
+
+.global overworld_h_six
+overworld_h_six:
+    add r5, r0, #0x0
+    mov r4, #0x0
+    ldrb r0, [r5, #0x5] 
+    ldrb r1, [r5, #0x1a]
+    lsl r1, r1, #0x8
+    orr r0, r1
+    bl npc_get_type
+    ldr r1, =0x08067f9d
+    bx r1